Merge pull request #546 from sgmap/fix-76

[Fix #76] The develop branch is now dev

.circleci/config.yml

@@ -68,7 +68,7 @@ jobs:
             - "0a:67:42:7d:7e:b7:e1:3c:48:8f:bf:68:10:51:a8:44"
       - deploy:
           command: |
-            if [ "${CIRCLE_BRANCH}" == "develop" ]; then
+            if [ "${CIRCLE_BRANCH}" == "dev" ]; then
               bundle exec rake deploy_ha
             fi
 

config/deploy.rb

@@ -24,7 +24,7 @@ set :deploy_to, '/var/www/tps_dev'
 
 case ENV["to"]
 when "staging"
-  set :branch, ENV['branch'] || 'develop'
+  set :branch, ENV['branch'] || 'dev'
   set :deploy_to, '/var/www/tps_dev'
   set :user, 'tps_dev' # Username in the server to SSH to.
   appname = 'tps_dev'