upload neues Project
Merge branch 'master' of https://github.com/memo1012/swa.git

Conflicts:
	shop3/src/main/java/de/shop/artikelverwaltung/domain/Artikel.java