Properties conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/nbproject/private/private.properties