Tocl development update
Merge branch 'master' of https://github.com/mahdaen/triton-ui