Layout fixes
Merge remote-tracking branch 'Github/layoutfix'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/likes/browse_match.haml
	app/views/likes/my_matches.haml
	app/views/static_pages/settings.html.haml
	app/views/users/my_profile.html.haml
	app/views/users/profile.html.haml