Merge origin/databaseEndringer into databaseEndringer