Merge pull request #3 from ARTFL-Project/master

merge downstream
Merge pull request #24 from clovis/master

Fix css and merge moer code
Merge pull request #25 from clovis/master

Many fixes, and make collocation use ajax calls to update results
Merge pull request #26 from clovis/master

Updates to frequency report
Merge pull request #27 from clovis/master

Add missing file
fixed bug in MetadataQuery pattern hierarchy
Merge pull request #4 from ARTFL-Project/master

merge upstream
Merge pull request #28 from clovis/master

update branch: add missing scripts, collocation cloud, layout fixes
Merge pull request #29 from clovis/master

various enhancements to collocations
Merge pull request #32 from clovis/master

Various fixes
Merge pull request #34 from clovis/master

More bug fixes
unicode normalization for word and metadata searches
Merge pull request #5 from ARTFL-Project/master

merge downstream
Merge pull request #35 from rwhaling/master

merge upstream
Merge pull request #36 from clovis/master

Another fix
Merge pull request #7 from ARTFL-Project/master

Update downstream