slight searchandnavi input bugfix
Merge branch 'master' into Kenneth
initial icons for travelling by car or by foot
fixed slight merge conf