Getting things in sync
Merge branch 'master' of https://github.com/artificialgold/CMZeroAPIV2
Fixed missing project from solution following merge