Merge branch 'keysFix' of git://github.com/romankurbatov/trikRuntime
Merge branch 'master' of https://github.com/trikset/trikRuntime
Updated UML docs, some cleanup
Merge branch 'master' into scriptAbortFix