Upgraded to Portal 6.1.0.0
Merge branch 'master' of github.com:CHAOS-Community/CHAOS.Portal.MCM

Conflicts:
	src/app/CHAOS.MCM/Extension/MetadataSchema.cs
	src/test/CHAOS.MCM.Test/Extension/MetadataSchemaTest.cs