FIXED: unresolved conflict
CHANGED: url path under /manage
Merge remote-tracking branch 'origin/zlk'

Conflicts:
	ymmbooking.py
Merge branch 'master' of https://github.com/starrify/ymmbooking into zlk
ADDED: 7 pages for admin in total, with a few bugs
NOTE: flight.html is not available