Merge pull request #61 from ARTFL-Project/master

update downstream
temporarily reinstate old behavior for search term arg handling
Merge branch 'master' of github.com:clovis/PhiloLogic4
minor patch
Merge pull request #290 from clovis/master

temporarily reinstate old behavior for search term arg handling
merge rwhaling branch
Merge pull request #62 from ARTFL-Project/master

update downstream
restore overwritten changes in sidebar.mako
Merge pull request #292 from clovis/master

Merge upstream
minor clean-ups
small tweaks to xml cleanup script
Merge branch 'master' of github.com:ARTFL-Project/PhiloLogic4
Remove sticky footer, other bug fixes
tweak UI performance
restore overwritten changes
Merge pull request #293 from clovis/master

Web UI tweaks
clean-up and bug fixes
fix bug in time series
web optimization
UI fixes, and collocation fixes