closes #10
Merge branch 'develop' of https://github.com/Edugate/ResourceRegistry into develop