Merge remote-tracking branch 'origin/Feature_Schwarzes_Loch'

Conflicts:
	Beats.txt
Merge branch 'master' of https://github.com/xrizza/TrainingRepo into Feature_Schwarzes_Loch