Merge branch 'develop'
removed old "cf" directory
Merge branch 'master' into develop