topics/dashboard
Merge branch 'master' of https://github.com/larswise/rCMS

Conflicts:
	CMS_i18n/bin/Debug/CMS_i18n.dll
	CMS_i18n/bin/Debug/CMS_i18n.pdb
	CMS_i18n/obj/Debug/CMS_i18n.csproj.GenerateResource.Cache
	CMS_i18n/obj/Debug/CMS_i18n.dll
	CMS_i18n/obj/Debug/CMS_i18n.pdb
	ZCMS.v11.suo
	ZCMS/bin/CMS_i18n.dll
	ZCMS/bin/CMS_i18n.pdb
	ZCMS/bin/ZCMS.dll
	ZCMS/bin/ZCMS.pdb
	ZCMS/obj/Debug/ZCMS.csprojResolveAssemblyReference.cache
	ZCMS/obj/Debug/ZCMS.dll
	ZCMS/obj/Debug/ZCMS.pdb
	ZCMSUnitTest/bin/Debug/CMS_i18n.dll
	ZCMSUnitTest/bin/Debug/CMS_i18n.pdb
	ZCMSUnitTest/bin/Debug/ZCMS.dll
	ZCMSUnitTest/bin/Debug/ZCMS.pdb
	ZCMSUnitTest/bin/Debug/ZCMSUnitTest.dll
	ZCMSUnitTest/bin/Debug/ZCMSUnitTest.pdb
	ZCMSUnitTest/obj/Debug/ZCMSUnitTest.csprojResolveAssemblyReference.cache
	ZCMSUnitTest/obj/Debug/ZCMSUnitTest.dll
	ZCMSUnitTest/obj/Debug/ZCMSUnitTest.pdb