init
Merge branch 'master' of https://github.com/knti1012/swe.git

Conflicts:
	shop/src/main/resources/sql/01_indexes.sql
	shop/src/main/resources/sql/10_hibernate_sequence.sql
	shop/src/main/resources/sql/20_adresse.sql
	shop/src/main/resources/sql/21_kunde.sql
	shop/src/main/resources/sql/30_artikel.sql
	shop/src/main/resources/sql/40_bestellung.sql
	shop/src/main/resources/sql/41_bestellposition.sql
	shop/src/main/resources/sql/50_lieferung.sql
	shop/src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/knti1012/swe.git
Merge branch 'master' of https://github.com/knti1012/swe.git
Merge branch 'master' of https://github.com/knti1012/swe.git
init