icons rewr
Merge branch 'develop' of https://github.com/Edugate/ResourceRegistry into develop
Merge branch 'develop' into 1.x-stable