fixes in javascript due to pushstate, initial support of query syntax in highlighter
Merge pull request #95 from clovis/master

Update upstream