Avances barra de dinero y cambio categoria
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada

Conflicts:
	bin/loadControllers.js
	controllers/usuario.js