Merge commit
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Changes in Order bean and hbm.xml, Test cases updated