add new options 'ingle portfolio layout'
fix merge conflict
change version and screen, add new cherry plugin
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop