FIXED: ...removed -x bit for many js/css/html files. AMAZING MACOS.
FIXED: provide airport names instead of city names in flight search result
CHANGED: using a newer version of bottle.py from https://github.com/defnull/bottle
ADDED: config.secret
ADDED: a prototype of user authentication
Merge remote-tracking branch 'origin/master' into __starrify__
bar
d
Merge remote-tracking branch 'origin/czh'

Conflicts:
	.DS_Store
	template/.DS_Store
	template/flight/search.html
	template/hotel/search.html
	template/index.html
	template/manage/hotel.html
	template/order.html
	template/trade/comment.html
	template/trade/comment_history.html
FIXED: .....moved head_bar.inc to template/!!!
CHANGED: directory structure
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk

Conflicts:
	template/manage/flight.html
	ymmbooking.py
CHANGED: directory structure
ADDED: core js files of manage
NOTE: flight page is not available