Merge pull request #100 from lifeBCE/master

Route path optimization and dashboard nav object update
Merge remote-tracking branch 'upstream/master'