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

Conflicts:
	target/m2e-wtp/web-resources/.gitignore
	target/m2e-wtp/web-resources/META-INF/maven/com.hankooktire/mams/pom.properties