Merge https://github.com/friendica/friendica into pull

Conflicts:
	include/bbcode.php

diff --cc include/bbcode.php
index 2c1c2378f1137d68a6e7d505d93e031f74550ad5,36d480a178cfed14c8a7cb41920add2c84e246ed..e219d538362d9d48160905c977ef616793b9b5a9
--- 1/include/bbcode.php
--- 2/include/bbcode.php
+++ b/include/bbcode.php
@@@ -162,7 -162,7 +162,8 @@@ function bbcode($Text,$preserve_nl = fa
  
        // handle nested lists
        $endlessloop = 0;
 -      while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list]") !== false) &&
++
 +      while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) &&
               (strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && 
               (strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) {
                $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text);