+ commit to pull
Merge branch 'gui3' of https://github.com/Tokanagrammar/tokanagrammar-dev.git into gui3