Added hot_deploy
Merge branch 'master' into develop