Merge testing and new configuration
Merge remote-tracking branch 'origin/database_branch' into database_branch
Merge remote-tracking branch 'origin/database_branch' into database_branch
Working auth, login, DB mapping.