Merge pull request #24 from ARTFL-Project/master

Update downstream
limit collocation results to a hundred in the sidebar
Merge branch 'master' of github.com:clovis/PhiloLogic4
Merge pull request #140 from clovis/master

Limit number collocation results in sidebar to prevent browser freezing