Света занялась макетами
Света продолжает жарить
Merge branch 'Deploy' of https://github.com/esc-isenergy/Isenergy into Deploy

Conflicts:
	IsEnergy/IsEnergy.v11.suo
	IsEnergy/IsEnergyModel/IsEnergy_db.Designer.cs
	IsEnergy/IsEnergyModel/IsEnergy_db.edmx.diagram
	IsEnergy/IsEnergyModel/obj/Release/TempPE/IsEnergy_db.Designer.cs.dll
	IsEnergy/IsEnergyModel/obj/Release/TempPE/IsEnergy_db.cs.dll