Fix application layout

I owe :beers:
Adding gemset
Merge branch 'master' into kss

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