1
Merge branch 'master' of https://github.com/MiddleAges/MiddleAges

Conflicts:
	MiddleAges/MiddleAges.BL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MiddleAges/MiddleAges.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MiddleAges/MiddleAges.UnitTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MiddleAges/MiddleAges.v11.suo