Move encore to cm-11.0
Merge pull request #203 from steven676/master

Move encore to cm-11.0