fixed my environment problems
Merge branch 'master' of github.com:RHESSys/RHESSysWeb