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
clear capybara sessions before each feature test, and add an id to quantity input
remove Database usage from tests, and add 'item-' to the id of items
Merge branch 'master' of github.com:Agsiegert/wtpho into images
commented out seed data for categories, users tables not setup yet