Pulling the master branch to the geolocalisation branch

It will permit to add the geolocalisation activity to the UrbApp project.