Propiedades de la Mac
Merge branch 'master' of https://github.com/amerikillo/SCR

Conflicts:
	SCR/nbproject/private/private.xml
Cambios