Remove duplicate of Quantity on the order page
Merge branch 'master' of github.com:Agsiegert/wtpho into bens_set_order

Conflicts:
	app/models/user.rb