add ip detect
add ip detection
Merge branch 'master' into production