update migration file with relationships
Merge branch 'steve'
Merge branch 'master' into toan
update order.rb
Merge pull request #3 from toannguyenle/toan

Toan