User properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/nbproject/private/private.properties
	client/nbproject/private/private.properties