Improved string tokenizer.
Merge branch 'master' of github.com:accucode/paragon-server
Improved list format.
Minor clean up