no message
Merge branch 'master' of https://github.com/mojjong/8bittravel

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/org.yo/web/pom.properties