Use a gem to distiguse Dev and staging
Update with master
Merge pull request #1731 from zz9pzza/issue_4031

4031 Use a gem to distiguish Dev and staging