cambios varios acumulados menores

varios
Merge branch 'master' of https://github.com/jesinor/TFT_13

Conflicts:
	app/controllers/aut.php
	app/views/iniciar.php