试图写了booking_history的js代码
Merge branch 'master' into czh

Conflicts:
template/index.html
test.py
Merge branch 'master' into czh
index

新增 index
，

，
Merge remote-tracking branch 'origin/czh'

Conflicts:
	template/index.html
Merge remote-tracking branch 'origin/liang'
ADDED: hotel info adding via /manage/hotel/async
FIXED: navigation tab of hotel/inn booking in /hotel/search
FIXED: navigation path from "酒店搜索" to "酒店预定"
FIXED: /trade/remark -> /trade/comment. YOU SHALL HAVE TOLD ME ABOUT THIS
ADDED: set WAL to sqlite3 when creating new db
ADDED: hotel search
ADDED: hotel search for admin
CHANGED:flight search
Merge branch 'master' into liang
CHANGED: navigator..
Merge branch 'master' into liang