no brain commit by pf
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git

Conflicts:
	src/main/resource/filefortestgit