Intermediate version




Signed-off-by: voidbag <voidbag@gmail.com>
aa
Merge branch 'master' of https://github.com/THS-gachon/THS_mobileWeb.git

Conflicts:
	THS_mobileWeb/src/main/java/com/gachon/swdm/ths/web/bean/User.java
	THS_mobileWeb/src/main/java/com/gachon/swdm/ths/web/controller/HomeController.java
	THS_mobileWeb/target/classes/com/gachon/swdm/ths/web/bean/User.class
	THS_mobileWeb/target/classes/com/gachon/swdm/ths/web/controller/HomeController.class
	THS_mobileWeb/target/m2e-wtp/web-resources/META-INF/maven/org.springframework.samples.service.service/THS_mobileWeb/pom.properties
니가 수정해