added viewport metatag to application layout
Merge branch 'sprint1'

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