Somewhat styled, pre-querified stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/catalog-detail.js
	app/styles/main.scss
	app/views/catalog.detail.html
	app/views/catalog.html
Closer, header needs styling