completed item relationships
Merge branch 'master' into item_relationships

Conflicts:
	lib/sales_engine.rb
Merge branch 'item_relationships'