added a space to CMake
Merge branch 'master' into wicke
STUPID
Worked on platform code, deleted state machine test
Merge branch 'ric'
FF this branch