Teamwork yo
Merge branch 'master' into fixture-stories

Conflicts:
	app/client/templates/helpers.js