...
fixed total price
Merge branch 'master' of https://github.com/czhu12/ams

Conflicts:
	app/static/js/controllers.js