rolend 12-1 II
Merge branch 'master' of
https://github.com/rolendSunq/vcaseServiceTest.git

Conflicts:
	src/main/webapp/WEB-INF/views/main.jsp
	target/m2e-wtp/web-resources/META-INF/maven/com.hankooktire/mams/pom.properties