Issue 3284: Change subject line for account activation emails
Merge branch 'master' into deploy
Updating whitelist and resolving conflict
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Fixing deploy script for db server
Merge branch 'master' into deploy
Merge branch 'deploy' of git://github.com/otwcode/otwarchive into issue_3479

Conflicts:
	config/deploy/production.rb