FIXED: 左边和顶上的导航栏
adding tab in the left

adding tab in the left
CHANGED: flight_search -> booking_history

表单提交：
<form class="bookquery"><div>[航班号]</div></form>
FIXED: navigator, remark->history

导航栏是不是这样拼的－ －。
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