login as admin
Merge remote-tracking branch 'origin/czh'
CHANGED: booking_history, added submit 'type'
Merge branch 'master' into liang