Merged Google Maps work into the main Wifil project.