Adding resource types to the plugin specification.
Merge remote-tracking branch 'origin/develop' into feature/resource-types-in-plugin-specs
renames for clarity.
Merge pull request #300 from continuuity/feature/resource-types-in-plugin-specs

Adding resource types to the plugin specification.