Added caching for resolved resource URLs
ecube: Updated version to 2.5.11
Merge branch 'release-2.5.x'

Conflicts:
	package.json