...
Merge branch 'master' of https://github.com/kelvinyong/bace.git

Conflicts:
	newbaceMIS/template/booking.html