Fix Seed
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/server/seed.coffee
Merge remote-tracking branch 'origin/master'
Tach Inventory (inventory, inventoryReview)