Resolve version conflict with forked CRNS Project

Merge Version Nixdorf and Version Schrön in oder to have one master again