req 90 or so
Merge branch 'master' of https://github.com/teamreactive/cubo

Conflicts:
	usuarios/templates/usuarios/index-solicitante.html