Merge branch 'zlk' into czh
Merge branch 'zlk' into czh
unchanged
增加了订单管理
Merge branch 'czh'
Merge branch 'master' of https://github.com/starrify/ymmbooking

Conflicts:
	template/manage/flight/transaction.html
CHANGED: booking_history, comment_history.
CHANGED: hotel_search, submit form:price
Merge branch 'zlk'

Conflicts:
	template/hotel/search.html
Merge branch 'zlk'

Conflicts:
	data/dbfile
Merge branch 'zlk'
UPDATED: booking_history with proper functionality