Switch IP
Update survey url
Merge branch 'master' into dev