Merge pull request #106 from clovis/master

Update upstream
Merge pull request #11 from ARTFL-Project/master

merge downstream
small db fix, probably redundant
merge upstream
first attempt at a standard TEI loader/template setup
Merge pull request #115 from clovis/master

Many bug fixes all around in preparation of the demo
Merge pull request #116 from clovis/master

bug fixes
Merge pull request #117 from clovis/master

optimize scrolling in text object displays
Merge pull request #119 from clovis/master

fix text overflow and use gradient in citations
Merge pull request #120 from clovis/master

Push fixes upstream
merged with upstream
Merge pull request #123 from rwhaling/master

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

Update downstream