Merge remote-tracking branch 'upstream/master'

Conflicts:
	Client/Javaapplication/nbproject/private/private.xml

dwa