Modified pom.xml
Modified messages.prop hello.world
Merge branch 'master' of https://github.com/sriwanlop/samurai

Conflicts:
	src/main/java/conf/messages.properties