Fix missing includes
Merge branch 'master' into navigation
fix qt includes (to get rid of pedantic GCC errors)
address review comments (syntax and formatting)
Merge navigation in navigation-WorldInHandNavigation