Merge branch 'ember' of github.com:markson/Shopping-Site into ember

Conflicts:
	Brocfile.js
	dist/assets/app.js.gz
Merge branch 'ember' of github.com:markson/Shopping-Site into ember