chenge date format, chenge $ on jQuery in JavaScript
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop