Merge remote-tracking branch 'refs/remotes/origin/bugfix-PLUGIN_ASSETS' into dev-v3

Conflicts:
	includes/base_controls/QControlBase.class.php
Merge remote-tracking branch 'refs/remotes/origin/feature-ComposerPlugins' into feature-ComposerPlugins