Closes Feature #1657
New Order Options
Merge branch 'master' into new_item_locations

Conflicts:
	salor-retail/app/models/vendor.rb
	salor-retail/db/schema.rb