ADDED: html, js, css files of hotel and flight management
ADDED: html and css of hotel, flight management, enhanced popover plugin
ADDED: function of hotel adding
Merge branch 'master' into zlk

Conflicts:
	ymmbooking.py
ADDED: function of search
Merge branch 'master' into zlk
FIXED: a few bugs
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk
UPDATED: function search hotel
UPDATED: full featured (????) hotel page, before test
Merge branch 'master' into zlk

Conflicts:
	data/dbfile
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk
UPDATED: page hotel after test, with a few bugs still
adding tab in the left

adding tab in the left
Merge remote-tracking branch 'origin/czh'
......STUPID JOB! XD

Conflicts:
	template/flight/search.html
	template/hotel/search.html
	template/index.html
	template/trade/.DS_Store
	template/trade/booking_history.html
	template/trade/comment.html
	ymmbooking.py
FIXED: ...removed -x bit for many js/css/html files. AMAZING MACOS.
FIXED: provide airport names instead of city names in flight search result
FIXED: compatibility with chrome
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk

Conflicts:
	template/manage/flight.html
	template/manage/hotel.html
	ymmbooking.py
FIXED: bug in classname of <tr>