Merge pull request #164 from clovis/master

Merge pull request #31 from ARTFL-Project/master
Merge pull request #165 from clovis/master

huge performance boost in all reports, more visibly in collocations and time series
Merge pull request #166 from clovis/master

bug fixes and optimizations
Merge pull request #167 from clovis/master

many bug fixes
Merge pull request #168 from clovis/master

fixes to time series
fixes to Loader
Merge pull request #32 from ARTFL-Project/master

Update branch