bs3
Merge remote-tracking branch 'origin/master' into bootstrap3

Conflicts:
	site.cfg
bootstrap3 support
logo added/styled
Use wheelcms_project settings
Remove old style db config
fix fauly mediaroot
Depend on bootstrap3 disqus
Switch to master branches now that bootstrap3 support is in master everywhere