not sure what this is
Merge branch 'master' of https://github.com/rvrtex/ProfileJavaThree

Conflicts:

	hellorest/target/m2e-wtp/web-resources/META-INF/maven/edu.neumont.csc380/hellorest-server/pom.properties