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
Merge pull request #2 from friendica/master

merge from friendica/red
introduce a connection type called 'ifpending' for number 6 of issue #395 - so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu
finish "ifpending" connections
provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled.
this makes rpost to another channel work somewhat - but there are issues, since the ACL will belong to the wrong channel. Leaving disabled for now. I don't know that we can solve all the issues without a different design so this may end up in a plugin for those who are willing to put up with the shortcomings.
Typo in externals SQL.
Hope I have repaired the channel admin page.

Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.

On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
Merge remote-tracking branch 'upstream/master'
use parent_mid in the parent query for enotify instead of of the parent id. This should fix the issue with encrypted content in the notification messages (for locally posted replies). The fix was a bit harder than anticipated because we store the parent id as an int in the notify table so this had to be modified to char storage as well.
Merge remote-tracking branch 'upstream/master'
issue #395, item 2
Merge pull request #397 from sasiflo/master

Try to repair of channel administration
jot and location style fixes
mod/item - get rid of some failed experiments, duplicated code and unused code.
Merge https://github.com/friendica/red into pending_merge
a bit more work towards issue #395 - cleaning up some cases which were going to the url directly and which weren't going through chanview.  Also worth noting - mentions in posts do not go through chanview. Perhaps it is time to kill chanview (except we then cannot implemented a "connected" or "connect" button since we don't have any control over the landing page). For the time being I'm just trying to trap as many of the "visit URL" links as possible and sending them to a common place. Then we can figure out how that common place should behave.