Merge origin/master

Conflicts:
	application/views/UsuarioAP/Usuarios.php
Merge origin/master