Add port to db configs
Adding user to variables
Merge remote-tracking branch 'origin/develop' into develop