FIXED: error when adding new hotels: removed cursor.commit()
增加了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
ADDED: fixed ordering of results of hotel search
FIXED: 左边和顶上的导航栏