-revert again
Merge branch 'indigo-devel' of https://github.com/AlexReimann/navigation into indigo-devel