change the local db username
Merge remote-tracking branch 'origin/dev' into dev