cambios de usuarios
Merge remote-tracking branch 'xleninx/master'

Conflicts:
	application/controllers/auth.php
	application/controllers/home.php