Fixed an issue with tokenizing strings that contained white space between tokens.
Merge branch 'master' of https://github.com/OpenGraal/GServer-v2