Fixed login section
Merge commit '9ec5e54ef876238b6e59b58e01c3b3b602a90c72' into feature/2015

Conflicts:
	app/views/index/index.html.haml
	app/views/layouts/2015.html.haml