reimplementing navbar colours that were undone by git-marjus
added padding around images floated right and left
took the padding out of bbcode.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/tpl/theme_settings.tpl

reset to upstream
Don't explicitly deny our strongest features existence.
Bring BBCode to profiles
Don't count deleted channels when figuring out where to send a user on login.
Never set background or color unless you set both.  If this is needed
in future, it should probably be reimplmented with the class anyway.
doc update
soft revert 9bb7811 until we can look at it more closely.
Merge https://github.com/friendica/red into pending_merge
Merge pull request #404 from git-marijus/master

bootstrapify aclselector
Merge pull request #405 from beardy-unixer/master

A few little fixes
we also need a loop breaker
make sure we can find that function
via Mario: default channel permissions not working on channel page
Revert to prepare_text, use bbcode only for with
Ooops, replaced too many
Use @+ to tag a forum and also restrict the post to the forum, this leaves @! tags private - period.
no this is the way to do it