merge commit
Merge branch 'build_system' of github.com:CellCognition/cecog into build_system