CSS
Merge branch 'master' into CSS

Conflicts:
	app/client/templates/helpers.js
theme listing styles
individual story template and styling
responsiveness
Merge branch 'master' into CSS

Conflicts:
	app/client/templates/content-templates.html
	app/client/templates/helpers.js
	app/client/templates/layout.html
	app/lib/router.js
Fixed linting errors