Merge branch 'develop'
Fixed deploy command
Merge branch 'master' into develop