fix plugin
Merge remote-tracking branch 'upstream/master' into drag

Conflicts:
	RcmAdmin/public/js/admin/plugin-drag.js
Merge pull request #182 from rodmcnew/drag

fix plugin api
Merge remote-tracking branch 'upstream/master'