!!!Deleted shortcodes and widgets in wramework!!!
add filter to slider.php
fix prev commit
Fix conflict
Add filter for slider
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
Data management interface fixedData management interface fixed
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
fix variable name
fix header-styling and main-layout options
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
Add plugin
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
add plugin zip
change version in style.css and replace screenshot.png
Merge branch 'develop'
fix after merge master and develop