FIXED: a bug that i've fixed before, but introduced again, in db.get_flight_transactions
Merge remote-tracking branch 'origin/czh'
Merge branch 'czh'
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk
FIXED: bug in head-bar that causes jquery plugins to be unavailable
Merge branch 'zlk' of https://github.com/starrify/ymmbooking into zlk
Merge branch 'master' of https://github.com/starrify/ymmbooking
Merge branch 'zlk'
Merge branch 'master' of https://github.com/starrify/ymmbooking

Conflicts:
	template/manage/flight/transaction.html
CHANGED: booking_history, comment_history.
UPDATED: a working version of hotel transaction, however, as time is
limited, this might be buggy and the code is a mess
CHANGED: hotel_search, submit form:price
FIXED: a few bugs in hotel transaction
Merge branch 'zlk'

Conflicts:
	template/hotel/search.html
FIXED: bugs in database; ADDED: hotel transaction history
Merge branch 'zlk'

Conflicts:
	data/dbfile
FIXED: two tiny bugs
Merge branch 'zlk'
FIXED: now able to integration with group 1
headbar fix