disable feature setting for collections and make feature settings for personal and new tab working.
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Revert "disable feature setting for collections and make feature settings for personal and new tab working."

This reverts commit ed00301bb641d716e43876572be640f8252b9b05.
Merge branch 'master' of https://github.com/friendica/red
add image floating to bbcode
Merge branch 'upstream'
oups
minor whitespace cleanup
Merge pull request #290 from git-marijus/master

add image floating to bbcode