Merge branch 'develop' into 'feature/atm-system'

# Conflicts:
#   ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs

ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs

@@ -17,6 +17,28 @@ namespace ReallifeGamemode.Migrations
                 .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
+            modelBuilder.Entity("ReallifeGamemode.Server.Entities.ATM", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int>("Balance");
+
+                    b.Property<bool>("Faulty");
+
+                    b.Property<float>("X");
+
+                    b.Property<float>("Y");
+
+                    b.Property<float>("Z");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ATMs");
+                });
+
             modelBuilder.Entity("ReallifeGamemode.Server.Entities.Ban", b =>
                 {
                     b.Property<int>("Id")