CHANGED:flight search
Merge branch 'master' into liang
CHANGED: navigator..
Merge branch 'master' into liang
增加了remark_history,修改了booking_history js部分
FIXED: typo 'depature->departure' in schema.sql
ADDED: data generator for 'price' for flight data in data_import.py
CHANGED: request parameter and return JSON format for flight search after requested by Liang
Merge remote-tracking branch 'origin/liang'
Merge remote-tracking branch 'origin/czh'

Conflicts:
	static/img/.DS_Store
	static/js/holder.js
	template/flight/search.html
	template/hotel/search.html
	ymmbooking.py
ADDED: hotel update/delete for managers
Merge branch 'master' into zlk

Conflicts:
	data/dbfile
ADDED: fixed ordering of results of hotel search
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk
UPDATED: page hotel after test, with a few bugs still