cambios gestion deals
Merge remote-tracking branch 'origin/desarrollo' into desarrollo

Conflicts:
	package.json
	public/modules/tratos/controllers/tratosCtrl.js
	public/modules/users/controllers/dealsCtrl.js
cambios gestion deals