Tokenizer basic changes
Merge branch 'develop' of https://github.com/pketki/newsindexer into develop