Refactored uri generation a bit.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/Pomona.Common/TypeSystem/ResourceTypeSpec.cs
Fixed messup in previous merge, which was done to avoid losing history.