Merge branch 'development/GPSroute'