fix production.rb mail parameters
fix production.rb conflict
Merge branch 'master' of https://github.com/mayaSun/myflix

""