commenting out logs with username and password
Merge branch 'master' into toolbox-dev