Minor comment + magic number fixes
Merge branch 'mk' of github.com:dhbwtd/dhbw-td into mk

Conflicts:
	dhbw-td/core/src/main/java/de/dhbw/td/core/waves/SimpleWaveFactory.java
Merge branch 'mk' of github.com:dhbwtd/dhbw-td into mk

Conflicts:
	dhbw-td/core/src/main/java/de/dhbw/td/core/waves/SimpleWaveFactory.java