EditarProyecto listo
Merge branch 'master' of https://github.com/mcunille/Pepinillo-Blaze

Conflicts:
	detalleProyecto_template.php
	index_template.php
Merge branch 'master' of https://github.com/mcunille/Pepinillo-Blaze