rolend 11-27
Merge branch 'master' of
https://github.com/rolendSunq/vcaseServiceTest.git

Conflicts:
	src/main/java/com/hankooktire/videobox/controller/UserController.java
	src/main/java/com/hankooktire/videobox/service/OvpServiceImpl.java
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/com.hankooktire/mams/pom.properties