Merge pull request #285 from clovis/master

bug fixes
bug fixes to collocation
bug fixes to collocation
fix collocations in sidebar, and initial support for selecting filtering in collocations
Merge pull request #286 from clovis/master

Fixes to collocations, and initial support for filtering options in collocations
reword layout of collocation filtering options
more work on collocation filtering layout
add XML validation to xml cleanup script, as well as documentation to modify tags and attributes
remove old files
add missing js plugin
cleanup
better handling of stopwords in web_config, display filter list in collocations
clean up scripts directory, use main reports for callbacks if possible
Merge pull request #287 from clovis/master

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

remove duplicate script
update Bootstrap version and tweaks in header
fix sidebar code
Merge pull request #289 from clovis/master

bug fixes
merged from ARTFL