Shorter gps notif message
Merge branch 'Develop'