new file:   .DS_Store
	new file:   .gitignore
	new file:   2welhuwz.r05.txt
	new file:   db/Earle-Initial-Dump.sql
	new file:   earle-crm-web/earle-crm-web.iml
	new file:   earle-crm-web/faces-config.NavData
	new file:   earle-crm-web/nb-configuration.xml
	new file:   earle-crm-web/pom.xml
	new file:   earle-crm-web/src/.DS_Store
	new file:   earle-crm-web/src/main/.DS_Store
	new file:   earle-crm-web/src/main/java/.DS_Store
	new file:   earle-crm-web/src/main/java/com/.DS_Store
	new file:   earle-crm-web/src/main/java/com/enterprise/.DS_Store
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/.DS_Store
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/charts/ChartBean.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/common/CrudService.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/common/QueryParameters.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/common/logging/LoggerProducer.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/common/logging/LoggingInterceptor.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/common/validation/ConstraintViolationInterceptor.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/ClaimsPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/DiaryPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/InsuredPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/LastClaimPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/MessagesPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/PanelPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/ProfessionPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/form/UsersPopulate.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/login/LoginAuthenitcatorService.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/login/LoginGateway.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/login/LoginResponse.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/login/UserDetails.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/messaging/Messages.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/navigation/BuildMenu.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/navigation/Pages.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/profession/Profession.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionColumn.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionGateway.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionService.java
	new file:   earle-crm-web/src/main/java/com/enterprise/crm/security/CurrentUserContent.java
	new file:   earle-crm-web/src/main/java/lexicon/errors.properties
	new file:   earle-crm-web/src/main/java/lexicon/messages.properties
	new file:   earle-crm-web/src/main/resources/.DS_Store
	new file:   earle-crm-web/src/main/resources/META-INF/.DS_Store
	new file:   earle-crm-web/src/main/resources/META-INF/persistence.xml
	new file:   earle-crm-web/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
	new file:   earle-crm-web/src/main/resources/log4j.xml
	new file:   earle-crm-web/src/main/setup/glassfish-resources.xml
	new file:   earle-crm-web/src/main/webapp/.DS_Store
	new file:   earle-crm-web/src/main/webapp/WEB-INF/ValidationMessages.properties
	deleted:    earle-crm-web/target/classes/.netbeans_automatic_build
	deleted:    earle-crm-web/target/test-classes/.netbeans_automatic_build
Merge branch 'master' of https://github.com/crabbeo/EarleCRM

Conflicts:
	earle-crm-web/nb-configuration.xml
	earle-crm-web/pom.xml
	earle-crm-web/src/main/java/com/enterprise/crm/charts/ChartBean.java
	earle-crm-web/src/main/java/com/enterprise/crm/common/CrudService.java
	earle-crm-web/src/main/java/com/enterprise/crm/common/QueryParameters.java
	earle-crm-web/src/main/java/com/enterprise/crm/common/logging/LoggerProducer.java
	earle-crm-web/src/main/java/com/enterprise/crm/common/logging/LoggingInterceptor.java
	earle-crm-web/src/main/java/com/enterprise/crm/common/validation/ConstraintViolationInterceptor.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/ClaimsPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/DiaryPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/InsuredPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/LastClaimPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/MessagesPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/PanelPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/ProfessionPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/form/UsersPopulate.java
	earle-crm-web/src/main/java/com/enterprise/crm/login/LoginAuthenitcatorService.java
	earle-crm-web/src/main/java/com/enterprise/crm/login/LoginGateway.java
	earle-crm-web/src/main/java/com/enterprise/crm/login/LoginResponse.java
	earle-crm-web/src/main/java/com/enterprise/crm/login/UserDetails.java
	earle-crm-web/src/main/java/com/enterprise/crm/messaging/Messages.java
	earle-crm-web/src/main/java/com/enterprise/crm/navigation/BuildMenu.java
	earle-crm-web/src/main/java/com/enterprise/crm/navigation/Pages.java
	earle-crm-web/src/main/java/com/enterprise/crm/profession/Profession.java
	earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionColumn.java
	earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionGateway.java
	earle-crm-web/src/main/java/com/enterprise/crm/profession/ProfessionService.java
	earle-crm-web/src/main/java/com/enterprise/crm/security/CurrentUserContent.java
	earle-crm-web/src/main/java/lexicon/errors.properties
	earle-crm-web/src/main/java/lexicon/messages.properties
	earle-crm-web/src/main/resources/META-INF/persistence.xml
	earle-crm-web/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
	earle-crm-web/src/main/resources/log4j.xml
	earle-crm-web/src/main/setup/glassfish-resources.xml
	earle-crm-web/src/main/webapp/WEB-INF/ValidationMessages.properties
	earle-crm-web/src/main/webapp/WEB-INF/beans.xml
	earle-crm-web/src/main/webapp/WEB-INF/ejb-jar.xml
	earle-crm-web/src/main/webapp/WEB-INF/faces-config.xml
	earle-crm-web/src/main/webapp/WEB-INF/glassfish-resources.xml
	earle-crm-web/src/main/webapp/components/common/content-left.xhtml
	earle-crm-web/src/main/webapp/components/common/content-right.xhtml
	earle-crm-web/src/main/webapp/components/common/footer.xhtml
	earle-crm-web/src/main/webapp/components/common/header.xhtml
	earle-crm-web/src/main/webapp/pages/changepassword.xhtml
	earle-crm-web/src/main/webapp/pages/dispData.xhtml
	earle-crm-web/src/main/webapp/pages/graphs.xhtml
	earle-crm-web/src/main/webapp/pages/home.xhtml
	earle-crm-web/src/main/webapp/pages/insuredadmin.xhtml
	earle-crm-web/src/main/webapp/pages/miscadmin.xhtml
	earle-crm-web/src/main/webapp/pages/newclaim.xhtml
	earle-crm-web/src/main/webapp/pages/paneladmin.xhtml
	earle-crm-web/src/main/webapp/pages/professionadmin.xhtml
	earle-crm-web/src/main/webapp/pages/searchclaim.xhtml
	earle-crm-web/src/main/webapp/pages/searchinsured.xhtml
	earle-crm-web/src/main/webapp/pages/useradmin.xhtml
	earle-crm-web/src/main/webapp/pages/welcome.xhtml
	earle-crm-web/src/main/webapp/resources/css/common.css
	earle-crm-web/src/main/webapp/resources/css/earle.css
	earle-crm-web/src/main/webapp/templates/basic-template.xhtml
	earle-crm-web/src/main/webapp/templates/main-template.xhtml
	earle-crm-web/src/test/java/com/enterprise/crm/common/QueryParametersTest.java
	earle-crm-web/src/test/java/com/enterprise/crm/login/LoginAuthenitcatorTest.java
	earle-crm-web/src/test/java/com/enterprise/crm/login/LoginGatewayTest.java
	earle-crm-web/src/test/resources/META-INF/resources/bespoke/resource/resource-test.xhtml
	earle-crm-web/src/test/resources/core/persistence.xml
	earle-crm-web/src/test/resources/core/resource/resource-test.xhtml
	earle-crm-web/src/test/resources/datasources/example-persistences.xml
	earle-crm-web/src/test/resources/datasources/hsqldb-ds.xml
	earle-crm-web/src/test/resources/glassfish/domain.xml
	earle-crm-web/src/test/resources/log4j.xml
	earle-crm-web/src/test/resources/test.properties
	earle-crm-web/target/classes/META-INF/services/javax.enterprise.inject.spi.Extension
	earle-crm-web/target/classes/com/enterprise/crm/common/CrudService.class
	earle-crm-web/target/classes/com/enterprise/crm/common/QueryParameters.class
	earle-crm-web/target/classes/com/enterprise/crm/common/validation/ConstraintViolationInterceptor.class
	earle-crm-web/target/classes/com/enterprise/crm/login/UserDetails.class
	earle-crm-web/target/classes/lexicon/errors.properties
	earle-crm-web/target/classes/log4j.xml
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/beans.xml
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/classes/lexicon/errors.properties
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/classes/log4j.xml
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/ejb-jar.xml
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/faces-config.xml
	earle-crm-web/target/earle-crm-web-0.1/WEB-INF/glassfish-resources.xml
	earle-crm-web/target/earle-crm-web-0.1/components/common/content-left.xhtml
	earle-crm-web/target/earle-crm-web-0.1/components/common/content-right.xhtml
	earle-crm-web/target/earle-crm-web-0.1/components/common/footer.xhtml
	earle-crm-web/target/earle-crm-web-0.1/components/common/header.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/changepassword.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/dispData.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/graphs.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/home.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/insuredadmin.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/miscadmin.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/newclaim.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/paneladmin.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/professionadmin.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/searchclaim.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/searchinsured.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/useradmin.xhtml
	earle-crm-web/target/earle-crm-web-0.1/pages/welcome.xhtml
	earle-crm-web/target/earle-crm-web-0.1/resources/css/common.css
	earle-crm-web/target/earle-crm-web-0.1/resources/css/earle.css
	earle-crm-web/target/earle-crm-web-0.1/templates/basic-template.xhtml
	earle-crm-web/target/earle-crm-web-0.1/templates/main-template.xhtml
	earle-crm-web/target/glassfish/domain.xml
	earle-crm-web/target/test-classes/META-INF/META-INF/resources/bespoke/resource/resource-test.xhtml
	earle-crm-web/target/test-classes/META-INF/core/persistence.xml
	earle-crm-web/target/test-classes/META-INF/core/resource/resource-test.xhtml
	earle-crm-web/target/test-classes/META-INF/datasources/example-persistences.xml
	earle-crm-web/target/test-classes/META-INF/datasources/hsqldb-ds.xml
	earle-crm-web/target/test-classes/META-INF/glassfish/domain.xml
	earle-crm-web/target/test-classes/META-INF/log4j.xml
	earle-crm-web/target/test-classes/META-INF/resources/bespoke/resource/resource-test.xhtml
	earle-crm-web/target/test-classes/META-INF/test.properties
	earle-crm-web/target/test-classes/core/persistence.xml
	earle-crm-web/target/test-classes/core/resource/resource-test.xhtml
	earle-crm-web/target/test-classes/datasources/example-persistences.xml
	earle-crm-web/target/test-classes/datasources/hsqldb-ds.xml
	earle-crm-web/target/test-classes/glassfish/domain.xml
	earle-crm-web/target/test-classes/log4j.xml
	earle-crm-web/target/test-classes/test.properties
	pom.xml