Updating configs.
Merge branch 'development' into release-0.3
Updating deploy.
Merge branch 'development' into release-0.3
Merge branch 'release-0.3'
Updating deployment tags.
Fixing mailer.
Merge branch 'release-0.3'
Updating deploy config.
Merge branch 'release-0.4'

Conflicts:
	config/deploy.rb
Merge branch 'development' into release-0.4
Merge branch 'release-0.4'
Updating deploy.rb
Merge branch 'development' into release-0.4
Merge branch 'release-0.4'
Merge branch 'development' into release-0.4
Merge branch 'release-0.4'
Merge branch 'development' into release-0.4
Merge branch 'release-0.4'
Fixing address checking.