Merge pull request #172 from jerv13/master

Refactor html editor
allow plugins to drag onto page
Merge pull request #173 from rodmcnew/drag

Drag plugins on page
Merge remote-tracking branch 'upstream/master'