resource and goal-req fix
Merge branch 'dbsh' of https://github.com/smohsen91/net.ood into dbsh

Conflicts:
	OOD-EMS-GUI/OOD-EMS-GUI/GUI/EnvPlanMngGUI/NewResControl.cs