Testing database manipulation
Merge origin/master into databaseTesting