Merge branch 'qa' into development
for some reason godamn data loader didn
't hash the passwords
messing with smtp settings
Merge branch 'development' into qa