Fixed Google Maps Arm 7, added new icon
Merge remote-tracking branch 'origin/master'
Fixed icon x 3 and athletics code keys updated