Merge pull request #94 from clovis/master

update upstream
Merge pull request #95 from clovis/master

Update upstream
Merge pull request #96 from clovis/master

Use sessionStorage for collocations, modularize javascript code
Merge pull request #97 from clovis/master

fixes to autocomplete
bug fix in Query.py
Merge pull request #98 from rwhaling/master

bug fix in Query.py
Merge pull request #16 from ARTFL-Project/master

Update downstream