2155
2317
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git

Conflicts:
	DBProject/WebRoot/admin/cinema/cinemaAdd.jsp
merge