Merge branch 'hotfix/env_variables'
Merge branch 'release/0.6.1'
Merge branch 'master' of github.com:CodePolaris/subprefeitura
Added config.action_mailer.default_url_options on all environments
Merge branch 'hotfix/fix_default_email_host' into develop