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 remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

whatever
added spoiler tag to bbcode help doc
added breaks after added bbcode spoiler line
Merge pull request #407 from tonybaldwin/master

added spoiler tag to bbcode help doc