maerkte
Merge branch 'master' of https://github.com/enjayes/logistikapp.git

Conflicts:
	workspace/LogistikApp/src/de/marktlogistikapp/logistikapp/LogistikApp.java