0117   client
Merge master into HEAD

Conflicts:
	nbproject/project.properties
Merge origin/master
Merge master into HEAD

Conflicts:
	nbproject/project.properties