1148
2031
2322
2325
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git
815
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git

Conflicts:
	DBProject/WebRoot/cinemaInfo.jsp
	DBProject/WebRoot/iwanttosee.jsp