Merge pull request #588 from goldrush/develop

Merge pull request #587 from goldrush/master
indipendent env_prod
Merge branch 'master' of ssh://github.com/goldrush/goldrush
Merge pull request #589 from goldrush/master

reverse