complete the user_order feature
Merge pull request #24 from jiyaqi/order

complete the user_order feature
 Merge confilict from jiaqi's show orders feature.
Merge branch 'jihao-master'