jh
Merge branch 'master' of https://github.com/sky629/MTTS.git

Conflicts:
	MTTS/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	MTTS/target/m2e-wtp/web-resources/META-INF/maven/com.mju/mtts/pom.properties
Merge branch 'master' of https://github.com/sky629/MTTS.git

Conflicts:
	MTTS/src/main/java/com/mju/mtts/dao/movie/MovieTimeDao.java
	MTTS/src/main/java/com/mju/mtts/movie/controller/ShowMoviesController.java
	MTTS/src/main/java/com/mju/mtts/movie/service/Impl/MovieTimeServiceImpl.java
	MTTS/src/main/java/com/mju/mtts/movie/service/MovieTimeService.java
	MTTS/src/main/resources/mapper/admin/MovieTimeMapper.xml
	MTTS/src/main/resources/mapper/mybatis-config-admin.xml
	MTTS/src/main/webapp/WEB-INF/views/reserv/reserv.jsp
	MTTS/src/main/webapp/static/manager/body.css
	MTTS/target/.gitignore
	MTTS/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	MTTS/target/m2e-wtp/web-resources/META-INF/maven/com.mju/mtts/pom.properties
123
Merge branch 'master' of https://github.com/sky629/MTTS.git
gogo