CB version 2.0 pull

CB version 2.0 config files are ready for master.