CHANGED: booking-history
Merge branch 'master' into liang
FIXED: search parameter.. removed '>'
FIXED: booking_history: js
CHANGED: layout of booking_history.
FIXED: datetime_picker of booking_history
FIXED:  [case: travel time < 0]
ADDED: a ...buggy comment search
changed:comment_history
Merge branch 'master' into liang

Conflicts:
	template/.DS_Store
	template/manage/flight.html
	template/manage/flight/flight.html
	template/trade/booking_history.html
	ymmbooking.py
UPDATED: a better flight.html
Merge branch 'zlk'

Conflicts:
	template/manage/flight/flight.html
FIXED: search::order_type, booking_history,comment_histroy,time.
Merge branch 'master' into liang
FIXED: booking_history search.
Merge remote-tracking branch 'origin/czh'
CHANGED: booking_history, added submit 'type'
Merge branch 'master' into liang
Merge branch 'master' into czh

Conflicts:
	data/dbfile
	template/manage/flight/flight.html
	template/trade/booking_history.html
	template/trade/comment.html