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

Conflicts:
	DBProject/WebRoot/admin/area/districtManagement.jsp
	DBProject/WebRoot/cinemaAdmin/screening/screeningAdd.jsp
	DBProject/WebRoot/cinemaAdmin/screening/screeningManagement.jsp
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git

Conflicts:
	DBProject/WebRoot/admin/cinema/cinemaApplication.jsp
1
Merge branch 'master' of https://github.com/MaggieTest/DBProject.git