Merge branch 'scriptsDir' of git://github.com/Anna-/trikRuntime
Merge branch 'master' of https://github.com/trikset/trikRuntime