Foi preciso
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/DFSServer/nbproject/private/private.properties
	Server/DFSServer/nbproject/private/private.xml