merge master into this branch

# Conflicts:
#	core/src/netwerkprog/game/util/game/Character.java
#	core/src/netwerkprog/game/util/game/Faction.java

core/src/netwerkprog/game/server/Parser.java

@@ -0,0 +1,15 @@
+package netwerkprog.game.server;
+
+import netwerkprog.game.util.data.ParserCallback;
+
+public class Parser {
+    private final ParserCallback callback;
+
+    public Parser(ParserCallback callback) {
+        this.callback = callback;
+    }
+
+    public void parse(String request) {
+        callback.onDataReceived(null);
+    }
+}