Environment settings changes
Merge branch 'beta_wb_testing' of github.com:pkwiecien/tumitfahrer into develop