Merge pull request #302 from rwhaling/master

merge upstream.
Merge pull request #64 from ARTFL-Project/master

Update downstream
Merge pull request #303 from rwhaling/master

new paging code
Merge pull request #65 from ARTFL-Project/master

Update downstream
bug fixes, implement very basic export functionality for current page in concordance and KWIC
Merge pull request #304 from clovis/master

bug fixes, implement very basic export functionality for current page
Merge pull request #31 from ARTFL-Project/master

merge downstream