Merge pull request #62 from ARTFL-Project/master

update downstream
restore overwritten changes in sidebar.mako
Merge pull request #292 from clovis/master

Merge upstream