config.action_mailer.default_url_options for development for devise forgot password email
add   config.action_mailer.default_url_options for production
Merge branch 'feature' into develop
Merge branch 'develop'