MERGED: with master
FIXED: unresolved conflict
CHANGED: url path under /manage
CHANGED: directory structure
Merge remote-tracking branch 'origin/zlk'

Conflicts:
	ymmbooking.py