Merge branch 'master' of https://github.com/stritti/tpl_bodenleger-stockach into master-local

Conflicts:
	README.md