changes done by dev 20 for navigation
Merge pull request #199 from raviosc/developer20

changes done by dev 20 for navigation