Changed apllication layout
Merge branch 'master' into redesign_layout

Conflicts:
	app/views/layouts/application.html.slim