Merge pull request #10 from ARTFL-Project/master

Update downstream
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