CHANGED:flight search
Merge branch 'master' into liang
CHANGED: navigator..
Merge branch 'master' into liang
增加了remark_history,修改了booking_history js部分
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