Adding geotriggers
Merge branch 'geotrigger'