Removed extraneous plugin folder
Merge branch 'dev'