Boostrapped SF

SF template updated to fit Bootstrap grid initial release.

Signed-off-by: Dan Hawes <dan@punctuatecreative.com>
Merge branch 'master' into feature/bootstrap-theme

Conflicts:
	src/views/pages/discuss.html.php
	src/views/pages/learn_contribute.html.php
	src/views/pages/learn_expand_your_team.html.php
	src/views/pages/learn_faq.html.php
	src/views/pages/learn_scripture_forge.html.php
	src/views/pages/terms_and_conditions.html.php
design: default template footer and header fixes.
design: Add padding to hdrnav
Merge branch 'master' into live