Template stuff!
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/bootstrap/css/new_base.css
Template stuff!