Properties
Merge branch 'develop' of https://github.com/FabiJhoel/JuegosDeportivos into develop

Conflicts:
	JuegosDeportivos/nbproject/private/private.xml