angular animate, font-awesome problems fixed
Merge eslem into develop

Conflicts:
	web/empleado/css/usuarios.css