Con plantilla seleccionada
Merge origin/master

Conflicts:
	Sistema/nbproject/project.properties
	Sistema/public_html/index.html