[cpqd-monet] Alterações nas domain classes
[cpqd-monet] Alterações gerais do Company e Contact
[cpqd-monet] Merge
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	domain/com/cpqd/monet/company/Company.groovy
	grails-app/controllers/com/cpqd/monet/company/CompanyController.groovy
	grails-app/domain/com/cpqd/monet/address/Address.groovy
	grails-app/domain/com/cpqd/monet/address/StreetType.groovy
	grails-app/domain/com/cpqd/monet/company/Company.groovy
	grails-app/domain/com/cpqd/monet/company/CompanyType.groovy
	grails-app/domain/com/cpqd/monet/company/ComplementType.groovy
	grails-app/i18n/messages_pt_BR.properties
	grails-app/views/company/_form.gsp
	grails-app/views/company/_formProspect.gsp
	grails-app/views/company/create.gsp
	grails-app/views/company/edit.gsp
	grails-app/views/company/list.gsp
	grails-app/views/company/show.gsp
	grails-app/views/index.gsp
	grails-app/views/layouts/main.gsp
	target-eclipse/classes/.gitignore
	target/.gitignore
	target/stacktrace.log
	test/unit/com/cpqd/monet/company/StreetTitleControllerTests.groovy
	test/unit/com/cpqd/monet/company/StreetTypeControllerTests.groovy