c
Merge remote-tracking branch 'origin/oauth' into oauth

Conflicts:
	cms.data/Shared/Models/Resource.cs
asdasdasd