add demo for ejs
do not loose currentState if tokenizer uses combination of next and push
fix prolog mode and update tests
Merge pull request #1703 from ajaxorg/highlighting/mixed

Do not loose currentState if tokenizer uses combination of next and push