Merge branch 'develop'
client rest
java 1.7
constants
piface tests
Merge origin/master into develop

Conflicts:
	pom.xml
test webservice