changed resource decorator to use embedded operations
use organization context if available
Merge pull request #44 from sandersonet/resource-decorator-changes

Resource decorator changes