Merge pull request #3 from jihao/master

Update
Merge pull request #4 from jihao/master

Update
Merge pull request #5 from jihao/master

Update
Merge pull request #6 from jihao/master

Update
Temp commit for new order process
Commit for partial show user orders page
Fix the issue that user_orders controller missing
 Commit order process, left visual design.
Merge to haoji's repository
Merge branch 'jihao-master'
Fix some merge error
Merge pull request #8 from jihao/master

Update
Merge pull request #20 from Alex-Rongzhen-Huang/master

Merge order process