Merge branch 'release/0.15.4' into develop
better support for custom resources which are not db models
bumbed version number
Merge branch 'release/0.15.5'