GPS
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controller/SolicitacaoController.js