changed deploy settings for new server
changed deploy branch from production to new_production (for now)
updated capistrano to use multistage
updated capistrano deploy files
updated database credentials and deploy file for capistrano
updated deploy temporarily
updated database.yml to use correct production db info
updated deploy.rb to the new server
Update staging to current master branch
Updated staging to production
Updated default branch for staging
Fixed some string method errors in cap deploy
Trying to get cap staging deploy to run correctly
Still working on staging deploy
Merge branch 'master' into staging

Conflicts:
	.travis.yml
	app/controllers/assignment_controller.rb
Merge branch 'production' into staging

Conflicts:
	.travis.yml
	config/deploy.rb
	config/deploy/production.rb
	config/deploy/staging.rb
	features/step_definitions/create_questionnaire.rb
	features/step_definitions/web_steps.rb
Merge branch 'production' into staging
Merge branch 'production' into staging
Merge branch 'staging' of https://github.com/expertiza/expertiza into staging
Fix bug that prevented teammates from editing author feedback.