Merge branch 'plugin_test' into github_master
moved manufacturing plugin into its own folder