Revision de controladores
Merge branch 'master' of https://github.com/s0wk/Tucarga-Angular

Conflicts:
	app/scripts/controllers/freight.js