added logo for prototyping
merge changes from the extension branch
fixing typo
Basic tokenization framework
replay tokenization test
Merge branch 'master' into extension-dev

So that master and extension-dev branches show the correct commit history to reflect the changes
Merge branch 'extension-dev'