-stylelistic changes
Merge commit 'b5dbc2285c7e0d3e9265cd1dba73e72fc3b75f80'

Conflicts:
	views/layout.haml