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