Updated CCModules and CMModules
Merge branch 'master' of https://github.com/patricja/wolf