added userlist
Merge remote-tracking branch 'origin/Ramos2' into zalimben1

Conflicts:
	administrarUsuarios/tests.py
	administrarUsuarios/views.py
	is2/urls.py
Documentacion: Administrar Usuarios, Autenticacion, Zar