updated layout
Merge branch 'master' of github.com:Novamantic/ecommerce

Conflicts:
	app/views/layouts/_header.html.haml