Fix class interface builder
Merge branch 'master' of https://github.com/CherryFramework/cherryframework4