req89
Merge branch 'master' of https://github.com/teamreactive/cubo

Conflicts:
	usuarios/static/usuarios/js/index-solicitante.js