added new fields to Order
Merge branch 'master' of https://github.com/capellayee/roo