Merge Geolocation Toolkits for Salesforce.com

Take both sets of code from the previous challenges (they are attached in the Assets section) and merge them into once installable un-managed. Make Google the default service for Geolocation and test the code out to ensure that it functions properly. Rewrite (tweak) the documentation based upon your new code.

If it is no longer possible to use SimpleGeo/Urban Airship's service, please remove it completely.