Style cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	dlib/views.py
	templates/base_layout.html