Adding features to layouts
Merge remote-tracking branch 'Github/merge_layout_backend'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/users/profile.html.haml