18
Merge branch 'master' of https://github.com/fdp09/cineplex_yaqian.git

Conflicts:
	Cineplex/WebContent/waiter/main.jsp