Merge pull request #49 from wigtor/master

Copiando de G1 a G3
90% de los errores
10% errores restantes
Merge branch 'master' of https://github.com/migueljara/manteka_ihc

Conflicts:
	CodeIgniter_2.1.3/application/views/cuerpo_plantillas_editar.php