oops, switch back to vip for example client.html
Merge branch 'master' into prod