Added support for GeoIP detection
Added more GeoIP fields
Merge branch 'origin/joseph'