Merge branch 'hotfix/0.5.2' into develop
add: env,EGEN_HOME
add: folsom
Merge branch 'develop'