[cpqd-monet] Atualizações nas mensagens, templates e controller
Correcao
Committer: Andre Temple  <andretemple@gmail.com>
modified:   com/cpqd/monet/address/Address.groovy
modified:   com/cpqd/monet/company/Company.groovy
modified:   ../views/company/_form.gsp
[cpqd-monet] Criação de domain, controller e view Prospect
[cpqd-monet] Criação de Employee, Functions e atualização de License

Foram criados também as views e controllers das mesmas.
Merge branch 'master' of https://github.com/CesarNog/monet

Conflicts:
	grails-app/conf/BuildConfig.groovy
	grails-app/controllers/com/cpqd/monet/company/CompanyController.groovy
	grails-app/domain/com/cpqd/monet/company/Company.groovy
	grails-app/domain/com/cpqd/monet/contact/Contact.groovy
	grails-app/i18n/messages_pt_BR.properties
	grails-app/services/com/cpqd/monet/company/CompanyService.groovy
	grails-app/views/company/_formProspect.gsp
	grails-app/views/company/edit.gsp
	grails-app/views/company/show.gsp
	grails-app/views/company/showProspect.gsp
	grails-app/views/layouts/main.gsp
	target-eclipse/classes/.gitignore
	target/stacktrace.log
Merge branch 'master' of https://github.com/CesarNog/monet

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	application.properties
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.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/Locality.groovy
	grails-app/domain/com/cpqd/monet/address/StreetTitle.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/domain/com/cpqd/monet/contact/Contact.groovy
	grails-app/domain/com/cpqd/monet/license/License.groovy
	grails-app/domain/com/cpqd/monet/license/LicenseType.groovy
	grails-app/i18n/messages_pt_BR.properties
	grails-app/services/com/cpqd/monet/company/CompanyService.groovy
	grails-app/views/company/_form.gsp
	grails-app/views/company/_formProspect.gsp
	grails-app/views/company/createProspect.gsp
	grails-app/views/company/edit.gsp
	grails-app/views/company/show.gsp
	grails-app/views/company/showProspect.gsp
	grails-app/views/index.gsp
	grails-app/views/layouts/main.gsp
	target-eclipse/classes/.gitignore
	target-eclipse/classes/dbdoc/_globalnav.gsp
	target-eclipse/classes/dbdoc/_index.gsp
	target-eclipse/classes/dbdoc/_overview-summary.gsp
	target-eclipse/classes/dbdoc/_stylesheet.gsp
	target-eclipse/classes/messages.properties
	target/classes/application.properties
	target/stacktrace.log