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

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

ReallifeGamemode.Server/Entities/ATM.cs

@@ -0,0 +1,32 @@
+using GTANetworkAPI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+/**
+* @overview Life of German Reallife - Entities ATM (ATM.cs)
+* @author VegaZ
+* @copyright (c) 2008 - 2018 Life of German
+*/
+
+namespace ReallifeGamemode.Server.Entities
+{
+    public class ATM
+    {
+        [Key]
+        public int Id { get; set; }
+        public int Balance { get; set; }
+        public float X { get; set; }
+        public float Y { get; set; }
+        public float Z { get; set; }
+
+        [NotMapped]
+        public Vector3 Position => new Vector3(X, Y, Z);
+
+        public bool Faulty { get; set; } = false;
+        public bool Active { get; set; } = true;
+
+    }
+}