JS优化
Merge branch 'master' of https://github.com/JoeCao/meetingroom

Conflicts:
	booking/views.py