Refactoring of geofence triggering
Merge branch 'master' of https://github.com/thecapsaicinkid/shoryuken
Merge branch 'master' of https://github.com/thecapsaicinkid/shoryuken
Reverting back to separate 'extra' fields