fixed passwords in loaders
Merge branch 'master' into deploy