Merge pull request #55 from ARTFL-Project/master

update downstream
Merge pull request #56 from ARTFL-Project/master

Merge upstream
Merge pull request #57 from ARTFL-Project/master

update downstream
rewrite navigation report
Merge pull request #277 from clovis/master

Rewrite navigation report