Merged
Added bootstrap 3.0.1
Merge branch 'master' into test

Conflicts:
	templates/layout.jade
	templates/widgets.jade
Update to Bootstrap 3