Merge branch 'hotfix-2.2.1'
Hot fix shortcode video preview
Hot fix shortcode video preview
Change get_the_time('F j, Y') on get_the_date()
release new version 2.3

Conflicts:
	functions.php
	includes/theme_shortcodes/media.php
	includes/theme_shortcodes/shortcodes.php
small fix for slider (orderby = title)
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop