removed menu items orders join table migration
Merge branch 'upstream_merge'
Changed orders to ordered items
merged conflicts
Merge pull request #19 from nickpassarella/master

Resolved conflicts with Kheang's pull request.