[Merge] lp:~thomas-voss/location-service/fix-gps-integration-and-allow-for-decorating-provider-names into lp:location-service

[♫ Robert Bruce Park ♫]

Ehhh guys, train puked itself a bit here, had to merge this manually. Please review my trunk commit to ensure I didn't make any mistakes:

http://bazaar.launchpad.net/~phablet-team/location-service/trunk/revision/133
-- 
https://code.launchpad.net/~thomas-voss/location-service/fix-gps-integration-and-allow-for-decorating-provider-names/+merge/238690
Your team Ubuntu Phablet Team is subscribed to branch lp:location-service.