Merge pull request #224 from SBS-team/test&fix

Test&fix
deploy restart fix
Updating deploy.rb
preproduction.rb changes
Merge branch 'dev' into test&fix