Update
Merge branch 'master' of https://github.com/weemo/Weemo.js_beta