Merge pull request #12 from ARTFL-Project/master

Update downstream
javascript fixes in KWIC/concordance functions
fixes to KWIC, and configure from db_locals which reports to enable
add time series back to the search form: we can now hide the button from db_locals
Merge pull request #86 from rwhaling/master

slight query syntax fix
disable unused functions, add progress bar to collocation report
cleanup including removing format.py
fixes in page image viewer
change url after ajax calls using History.js
Merge pull request #87 from rwhaling/master

QuerySyntax
scroll to highlighted term
Merge pull request #88 from clovis/master

Merge upstream
Merge pull request #89 from rwhaling/master

Un-buffer StrictParser
Merge pull request #13 from ARTFL-Project/master

Update downstream
fix indentation error
Merge pull request #90 from clovis/master

update upstream
Merge pull request #10 from ARTFL-Project/master

merge downstream