build/test Env setup extenden
Merged 'dev'.
Finish grunt-deloy-conf
Merge branch 'origin/dev'