Setting the correct parameters in db.php file for database connection
Adding informations of the new DB on VPS
Fixing conflicts
Merge branch 'master' into testing
Merge branch 'master' into testing
Merge branch 'master' into testing
Wrong variable name for main email addr (kvdom instead of kvodm)
Changing the name of the files used for server-related variables