Initial Frontend
Merge branch 'master' into frontend

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