Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master

 Initial commit

 Changes to be committed:
   (use "git rm --cached <file>..." to unstage)

	new file:   .classpath
	new file:   .project
	new file:   .settings/.jsdtscope
	new file:   .settings/org.eclipse.jdt.core.prefs
	new file:   .settings/org.eclipse.wst.common.component
	new file:   .settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	new file:   .settings/org.eclipse.wst.common.project.facet.core.xml
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.container
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.name
	new file:   .settings/org.hibernate.eclipse.console.prefs
	new file:   WebContent/META-INF/MANIFEST.MF
	new file:   WebContent/WEB-INF/beans.xml
	new file:   WebContent/WEB-INF/faces-config.xml
	new file:   WebContent/WEB-INF/lib/antlr-2.7.7.jar
	new file:   WebContent/WEB-INF/lib/c3p0-0.9.2.1.jar
	new file:   WebContent/WEB-INF/lib/commons-beanutils-1.8.3.jar
	new file:   WebContent/WEB-INF/lib/commons-codec-1.3.jar
	new file:   WebContent/WEB-INF/lib/commons-collections-3.2.jar
	new file:   WebContent/WEB-INF/lib/commons-digester-1.8.jar
	new file:   WebContent/WEB-INF/lib/commons-fileupload.jar
	new file:   WebContent/WEB-INF/lib/commons-io.jar
	new file:   WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
	new file:   WebContent/WEB-INF/lib/dom4j-1.6.1.jar
	new file:   WebContent/WEB-INF/lib/ehcache-core-2.4.3.jar
	new file:   WebContent/WEB-INF/lib/hibernate-c3p0-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-core-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-ehcache-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-entitymanager-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-envers-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-infinispan-4.2.3.Final-tests.jar
	new file:   WebContent/WEB-INF/lib/hibernate-infinispan-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-osgi-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/hibernate-proxool-4.2.3.Final.jar
	new file:   WebContent/WEB-INF/lib/infinispan-core-5.2.0.Beta3.jar
	new file:   WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar
	new file:   WebContent/WEB-INF/lib/javax.faces.jar
	new file:   WebContent/WEB-INF/lib/jboss-logging-3.1.0.GA.jar
	new file:   WebContent/WEB-INF/lib/jboss-logging-3.1.1.GA.jar
	new file:   WebContent/WEB-INF/lib/jboss-marshalling-1.3.15.GA.jar
	new file:   WebContent/WEB-INF/lib/jboss-marshalling-river-1.3.15.GA.jar
	new file:   WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar
	new file:   WebContent/WEB-INF/lib/jgroups-3.2.0.CR1.jar
	new file:   WebContent/WEB-INF/lib/jstl.jar
	new file:   WebContent/WEB-INF/lib/mchange-commons-java-0.2.3.4.jar
	new file:   WebContent/WEB-INF/lib/org.osgi.core-4.3.1.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.aop-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.asm-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.aspects-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.beans-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.context-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.context.support-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.core-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.expression-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.instrument-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.jms-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.orm-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.oxm-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.test-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.transaction-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.web-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.7.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/primefaces-3.5.jar
	new file:   WebContent/WEB-INF/lib/proxool-0.8.3.jar
	new file:   WebContent/WEB-INF/lib/rhq-pluginAnnotations-3.0.4.jar
	new file:   WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
	new file:   WebContent/WEB-INF/lib/spring-security-acl-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-aspects-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-cas-client-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-config-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-core-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-ldap-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-openid-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-parent-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-taglibs-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/spring-security-web-3.0.8.RELEASE.jar
	new file:   WebContent/WEB-INF/lib/standard.jar
	new file:   WebContent/WEB-INF/lib/stax2-api-3.1.1.jar
	new file:   WebContent/WEB-INF/lib/staxmapper-1.1.0.Final.jar
	new file:   WebContent/WEB-INF/lib/woodstox-core-asl-4.1.1.jar
	new file:   WebContent/WEB-INF/web.xml
	new file:   src/br/com/trendsoftware/webflex/crm/dao/DOC_CRM
	new file:   src/br/com/trendsoftware/webflex/model/WebFlex.java
Merge branch 'master' of https://github.com/TrendSoftware/webflex

Conflicts:
	WebContent/WEB-INF/faces-config.xml
	WebContent/WEB-INF/web.xml

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.
   (use "git commit" to conclude merge)

 Changes to be committed:

	new file:   .gitignore
	new file:   LICENSE
	new file:   README.md
	new file:   WebContent/WEB-INF/.faces-config.xml.jsfdia
	new file:   WebContent/WEB-INF/applicationContext.xml
	modified:   WebContent/WEB-INF/faces-config.xml
	modified:   WebContent/WEB-INF/web.xml
	new file:   WebContent/adm/index.xhtml
	new file:   WebContent/adm/login.xhtml
	new file:   WebContent/cliente_novo.xhtml
	new file:   WebContent/index.xhtml
	new file:   WebContent/login.xhtml
	new file:   build/classes/META-INF/persistence.xml
	new file:   build/classes/log4j.properties
	new file:   src/META-INF/persistence.xml
	new file:   src/br/com/trendsoftware/model/Banco.java
	new file:   src/br/com/trendsoftware/model/Cliente.java
	new file:   src/br/com/trendsoftware/model/Tarefa.java
	new file:   src/br/com/trendsoftware/model/Usuario.java
	new file:   src/br/com/trendsoftware/web/administrativo/UsuarioAction.java
	new file:   src/br/com/trendsoftware/web/administrativo/UsuarioFace.java
	new file:   src/br/com/trendsoftware/web/administrativo/UsuarioQuery.java
	new file:   src/br/com/trendsoftware/web/ferramentas/ClienteAction.java
	new file:   src/br/com/trendsoftware/web/ferramentas/ClienteFace.java
	new file:   src/br/com/trendsoftware/web/ferramentas/ClienteQuery.java
	new file:   src/br/com/trendsoftware/web/ferramentas/ClienteTest.java
	new file:   src/br/com/trendsoftware/web/ferramentas/Navegacao.java
	new file:   src/br/com/trendsoftware/web/financeiro/BancoAction.java
	new file:   src/br/com/trendsoftware/web/financeiro/BancoFace.java
	new file:   src/br/com/trendsoftware/web/financeiro/BancoQuery.java
	new file:   src/log4j.properties