added cmake as buildsystem
Merge branch 'master' into hierarchical