Change aq resizer and update plugin
Merge branch 'master' of https://github.com/CherryFramework/CherryFramework

Conflicts:
	includes/plugins/cherry-plugin.zip