Merge branch 'develop' into 1.x-stable
Merge branch '1.x-stable' of https://github.com/Edugate/ResourceRegistry into 1.x-stable
fix dom warnings during sync
Merge branch 'develop' into 1.x-stable
closes #51
Merge branch 'develop' into 1.x-stable
Merge remote-tracking branch 'upstream/1.x-stable' into 1.x-stable