Nathans working stuff, .classpath should be ignored
Merge branch 'master' of https://github.com/jthompsonNB/PetStore

Conflicts:
	.gitignore
	target/applicationPetstore.war
	target/arquillian/_DEFAULT___DEFAULT__test.war

target/classes/org/agoncal/application/petstore/domain/CreditCardType.cl
ass
	target/classes/org/agoncal/application/petstore/domain/Customer.class
	target/classes/org/agoncal/application/petstore/domain/Order.class

target/classes/org/agoncal/application/petstore/rest/ApplicationConfig.c
lass

target/classes/org/agoncal/application/petstore/security/LoginContextPro
ducer.class

target/classes/org/agoncal/application/petstore/security/SimpleCallbackH
andler.class

target/classes/org/agoncal/application/petstore/security/SimpleLoginModu
le.class

target/classes/org/agoncal/application/petstore/service/CatalogService.c
lass

target/classes/org/agoncal/application/petstore/service/CustomerService.
class

target/classes/org/agoncal/application/petstore/service/OrderService.cla
ss

target/classes/org/agoncal/application/petstore/util/ConfigPropertyProdu
cer.class

target/classes/org/agoncal/application/petstore/util/LoggingInterceptor.
class

target/classes/org/agoncal/application/petstore/web/AccountController.cl
ass
	target/classes/org/agoncal/application/petstore/web/LocaleBean.class

target/classes/org/agoncal/application/petstore/web/ShoppingCartControll
er.class
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

target/m2e-wtp/web-resources/META-INF/maven/org.agoncal.application/pets
toreee6/pom.properties
	target/maven-archiver/pom.properties

target/test-classes/org/agoncal/application/petstore/domain/AddressIT.cl
ass

target/test-classes/org/agoncal/application/petstore/domain/CategoryIT.c
lass

target/test-classes/org/agoncal/application/petstore/domain/CustomerIT.c
lass

target/test-classes/org/agoncal/application/petstore/domain/ItemIT.class

target/test-classes/org/agoncal/application/petstore/domain/OrderIT.clas
s

target/test-classes/org/agoncal/application/petstore/domain/ProductIT.cl
ass

target/test-classes/org/agoncal/application/petstore/security/LoginModul
eIT.class

target/test-classes/org/agoncal/application/petstore/service/AbstractSer
viceIT.class
merge
bhhjb
resources
merge
Merge github.com:jthompsonNB/PetStore into Deividas-build

Conflicts:
	.gitignore
	.settings/org.eclipse.wst.common.component