Merge pull request #306 from Crigges/master

Fixed bug in UnitObjEditing
fixed wrong change in pull request (#306)
fixed unit tests which were broken by Frottys standard lib changes
Fix + AddedSomeEnums