Merge branch 'master' into Mick

* master:
  fix error

core/src/netwerkprog/game/client/game/characters/DevTest1.java

@@ -1,10 +1,11 @@
 package netwerkprog.game.client.game.characters;
 
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.game.Faction;
 
 public class DevTest1 extends GameCharacter {
     public DevTest1() {
-        super("DevTest1", Faction.HACKER, "core/assets/ScifiCritters4.PNG");
+        super("DevTest1", Faction.HACKER, new TextureRegion());
     }
 }