Revisão de roles
Merge remote-tracking branch 'origin/master'

Conflicts:
	implementation/solution/src/main/webapp/modules/map/map-main.js