Kapazitäts-Service
Merge remote-tracking branch 'origin/master'

Conflicts:
	scstool/src/scstool/utils/Repository.java