client js
Merge branch 'dev' of https://github.com/CanvasApp/CanvasApp into dev