add code review comments in order model, application and order controller
merged conflict
Merge branch 'code_review'