Merge branch 'release/2.0.4' into develop
Fixed issue with emails

again a Rails 3 upgrade issue with the way
ActionMailer now sends emails
bump version 2.0.5
Merge branch 'release/2.0.5'