Cleanup
Merge branch 'master' of https://github.com/icarnaghan/mapper21

Conflicts:
	Mapper21.Reporting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache