fixed bugs on purchases
Merge branch 'master' of https://github.com/czhu12/ams
resolved conflict

Conflicts:
	app/views.py