pom updated
Merge branch 'master' of
https://github.com/mcrose/javaee6-example-server.git

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/py.org.pti/example-server/pom.properties