Merge branch 'John'
Merge branch 'John'
For beta period, load the js client from instance, will help roll out updates with less impact on other users.
Merge branch 'master' into John