Cabecera y pantallas de registro
Merge branch 'origin/desarrollo'

Conflicts:
	application/controllers/IndexController.php
	application/views/cabecera.inc.php