Merge pull request #284 from clovis/master

Port Web App to use new WSGI code
Merge pull request #285 from clovis/master

bug fixes
Merge pull request #286 from clovis/master

Fixes to collocations, and initial support for filtering options in collocations
add XML validation to xml cleanup script, as well as documentation to modify tags and attributes
Merge pull request #287 from clovis/master

Clean-up
Merge pull request #288 from clovis/master

remove duplicate script
Merge pull request #289 from clovis/master

bug fixes
Merge pull request #61 from ARTFL-Project/master

update downstream