jon
Merge branch 'master' of git://github.com/Nutzdaten/IceSubsRepo

Conflicts:
	IceSubs/obj/Debug/edmxResourcesToEmbed/Model1.csdl
	IceSubs/obj/Debug/edmxResourcesToEmbed/Model1.msl
	IceSubs/obj/Debug/edmxResourcesToEmbed/Model1.ssdl