Merge pull request #8 from ARTFL-Project/master

Update downstream
Merge pull request #42 from rwhaling/master

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

update branch
many fixes
Merge pull request #43 from clovis/master

update upstream
Merge pull request #47 from rwhaling/master

added documentation and ObjectFormatter
many fixes, and big improvement to ranked relevance due to a new algorithm for ranking
Merge pull request #48 from clovis/master

Bug fixes and new algorithm for ranked relevance
Merge pull request #10 from ARTFL-Project/master

Update downstream
Merge pull request #51 from rwhaling/master

page objects and Sqlite error handling
Merge pull request #52 from rwhaling/master

merge bug fixes, etc
Merge pull request #11 from ARTFL-Project/master

Update downstream
many changes to formatting, and multiple bug fixes everywhere
Fix navigating objects, and make links to neighboring objects follow scroll
add missing file for previous commit
Merge pull request #60 from clovis/master

Push fixes upstream
many fixes all around, the formatting code being the most invasive change
Merge pull request #77 from clovis/master

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

merge post-encyclopedie template edits