adding CF7
Merge branch 'newplugins'