updated model to inherit resourceModel
Merge branch 'dev' of github.com:TranscendComputing/StackStudio into dev