Merge remote-tracking branch 'origin/master'

Conflicts:
	implementation/webservice/ws/nbproject/private/private.xml