fix welcome.js and deploy.ry
Merge branch 'develop'