Merge origin/laranja into laranja

Conflicts:
	PortalDeBairros/grails-app/domain/portaldebairros/Empresa.groovy
Merge origin/laranja into laranja