Ejecución de Aplicacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	SGP/nbproject/private/private.xml