fixing broken sidebar parsing, jquery ref became ambiguous
Merge branch 'master' into gh-pages