Changes corresponding to renaming on castbin
Merge branch 'development' into staging
Merge branch 'master' of github.com:amitamb/screenjs-proxy