Merge remote-tracking branch 'origin/master'

Conflicts:
	fubica-core/.classpath
	fubica-core/src/main/resources/messages.properties
	fubica-core/src/main/resources/messages_pt_BR.properties
	fubica-core/target/classes/META-INF/maven/br.com.fubica/fubica-core/pom.properties
	fubica-core/target/classes/messages.properties
	fubica-core/target/classes/messages_pt_BR.properties
	fubica-ws/.classpath
	fubica-ws/.project
	fubica-ws/.settings/org.eclipse.jdt.core.prefs
	fubica-ws/.settings/org.eclipse.wst.common.component
	fubica-ws/.settings/org.eclipse.wst.common.project.facet.core.xml
	fubica-ws/pom.xml
	fubica-ws/src/main/webapp/WEB-INF/web.xml
	fubica-ws/target/m2e-wtp/web-resources/META-INF/maven/br.com.fubica/fubica-ws/pom.properties
	fubica-ws/target/m2e-wtp/web-resources/META-INF/maven/br.com.fubica/fubica-ws/pom.xml
Oganizando .gitignore