Merge branch 'keysFix' of git://github.com/romankurbatov/trikRuntime
Merge branch 'master' of https://github.com/trikset/trikRuntime
fixed aborting a script when it opened a widget for painting
Updated UML docs, some cleanup
Merge branch 'master' into scriptAbortFix
fixed too narrow labels
Merge pull request #40 from dvvrd/master

"String.format" function support
Added license notice
Merge branch 'scriptAbortFix' of git://github.com/romankurbatov/trikRuntime
- hopefully fixed random crashes when aborting script execution
- added new sequence diagram with script execution to UML docs
calculate label size with QFontMetrics
Merge branch 'labelSizeFix' of git://github.com/romankurbatov/trikRuntime
Merge pull request #42 from romankurbatov/labelSizeFix

Label size fix
Reading from socket as UTF-8, fixes russian labels on screen
Merge branch 'master' of https://github.com/trikset/trikRuntime
Support for pull-style working with gamepad
Fixed build
Added gamepad to metatypes for qt script
Added ports alises for briefer usage