New account added
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada
Merge branch 'master-qa' into jpattoni
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada

Conflicts:
	bin/loadControllers.js
	controllers/usuario.js
Merge branch 'master-qa' into jpattoni
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice into rquesada

Conflicts:
	controllers/usuario.js
Merge branch 'master-qa' into jpattoni
Contraseña encriptada en el login
Merge branch 'master-qa' into rquesada

Conflicts:
	controllers/usuario.js
Merge pull request #10 from proyecto4-tecdroid/rquesada

Contraseña encriptada en login
Merge branch 'master-qa' into jpattoni
Merge branch 'jpattoni' into master-qa
Hacer pagos, e ignorar
Merge remote-tracking branch 'origin/master-qa' into cdominguez
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-webservice
Actualizando PROD