shall i commit?
Merge branch 'master' of https://github.com/smohsen91/net.ood

Conflicts:
	OOD-EMS-GUI/OOD-EMS-GUI/Facade/EnvPlanFacade.cs
small changes