Compu taylor
Merge origin/master

Conflicts:
	WebServiceHello/src/java/REST/ApplicationConfig.java