CFS integration
Merge branch 'master' of https://github.com/forumone/wp-cfm