setup APPLICATION_ENV
Merge branch 'master' into dev