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

Conflicts:
	DBProject/WebRoot/cinemaInfo.jsp
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git