damn inspection almost over,  except for some ambiguous functions
Merge branch 'master' of https://github.com/smohsen91/net.ood

Conflicts:
	OOD-EMS-GUI/OOD-EMS-GUI/GUI/AbstractControl.cs