update before merge
Merge branch 'master' of https://github.com/toxic2302/Leistungssammler

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/toxic2302/Leistungssammler

Conflicts:
	.idea/workspace.xml
fix modul-picker