CHANGED: booking_history, added submit 'type'
Merge branch 'master' into liang