no message
Merge branch 'Deploy' of https://github.com/esc-isenergy/Isenergy into Deploy

Conflicts:
	IsEnergy/IsEnergy.v11.suo
	IsEnergy/IsEnergy/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache