Work on Detail view prototype layout
Work on header
Merge origin/master

Conflicts:
	app/css/app.css
	app/scss/app.scss
Worked on header