friday changes
Merge branch 'geoclicker'