Fixes a typo
Merge pull request #873 from sorlok/typo-fix

Fixes a typo
Merge pull request #874 from sorlok/instance_deact_fix

Fix memory corruption from instance_deactivate_object()
Merge branch 'master' into untitled_1
Added override flag to CXXFLAGS/CFLAGS/LDFLAGS
Merge branch 'make_fix_override' into untitled_1

Conflicts:
	ENIGMAsystem/SHELL/Makefile
Fix for myevent_pathend() not firing.