Add dotenv gem fix edit controller test
Merge with origin mh-branch