moj label

:panda_face:
Merge remote-tracking branch 'origin/master'

Conflicts:
	maas.v12.suo
	maas/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	wpf/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	wpf/obj/Debug/wpf_MarkupCompile.i.cache