Added script for dev deploy
some fixes in New
Merge branch 'hotfix'
Merge branch 'hotfix' into develop
Merge branch 'develop'