Merge pull request #236 from Tmee/orders

Orders
weird conflicts in the seeds file