Removed references to cdb, added necessary classes
Removed references to cdb
Merge branch 'master' of github.com:webdetails/cfr