Merge pull request #1529 from stevewithington/develop

allow for on{Type}{SubType}Edit and custom tab labels
Adding plugins drop down back