Merge uncommitted changes.

Push charger images
Fix for GPS (silly derp)
Else, I forgot