test conflict
Merge branch 'master' of https://github.com/mchyzer/personWebService

Conflicts:
	personWebService/src/main/java/org/personWebService/server/util/PersonWsServerUtils.java