Arreglos finales de diseño.
Merge branch 'master' of https://github.com/TecnologiasWeb/uja-tbw-1213

Conflicts:
	views/admin/admin.php