* removed CaveAndDiamods for now
Merge branch 'master' into cmake