DB Zgriff Artikel
Merge branch 'master' of https://github.com/Steffie/Fahrradshop.git

Conflicts:
	shop/src/main/java/de/shop/artikelverwaltung/domain/Artikel.java
	shop/src/main/java/de/shop/artikelverwaltung/domain/package-info.java
	shop/src/main/java/de/shop/artikelverwaltung/rest/ArtikelResource.java
	shop/src/main/java/de/shop/artikelverwaltung/service/ArtikelService.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/Bestellposition.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/Bestellung.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/Lieferung.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/TransportType.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/TransportTypeConverter.java
	shop/src/main/java/de/shop/bestellverwaltung/domain/package-info.java
	shop/src/main/java/de/shop/bestellverwaltung/rest/BestellungResource.java
	shop/src/main/java/de/shop/bestellverwaltung/service/AbstractBestellungServiceException.java
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungObserver.java
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungService.java
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungServiceImpl.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/AbstractKunde.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/Adresse.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/Firmenkunde.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/GeschlechtType.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/GeschlechtTypeConverter.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/PasswordGroup.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/Privatkunde.java
	shop/src/main/java/de/shop/kundenverwaltung/domain/package-info.java
	shop/src/main/java/de/shop/kundenverwaltung/rest/KundeDeleteBestellungExceptionMapper.java
	shop/src/main/java/de/shop/kundenverwaltung/rest/KundeResource.java
	shop/src/main/java/de/shop/kundenverwaltung/service/AbstractKundeServiceException.java
	shop/src/main/java/de/shop/kundenverwaltung/service/EmailExistsException.java
	shop/src/main/java/de/shop/kundenverwaltung/service/KundeDeleteBestellungException.java
	shop/src/main/java/de/shop/kundenverwaltung/service/KundeService.java
	shop/src/main/java/de/shop/util/interceptor/Log.java
	shop/src/main/java/de/shop/util/interceptor/LogInterceptor.java
	shop/src/main/java/de/shop/util/rest/DateConverter.java
	shop/src/main/java/de/shop/util/rest/DefaultExceptionMapper.java
	shop/src/main/java/de/shop/util/rest/JaxRsActivator.java
	shop/src/main/java/de/shop/util/rest/JaxRsLogFilter.java
	shop/src/main/java/de/shop/util/rest/Messages.java
	shop/src/main/java/de/shop/util/rest/NotFoundException.java
	shop/src/main/java/de/shop/util/rest/NotFoundExceptionMapper.java
	shop/src/main/resources/sql/create.sql
	shop/src/main/resources/sql/insert.sql