Merge branches 'master' and 'menu' of https://github.com/BenjaVR/Jungle-Wars into menu

# Conflicts:
#	core/src/be/howest/junglewars/screens/GameScreen.java
#	desktop/src/be/howest/junglewars/desktop/DesktopLauncher.java

Author: wardpauwels

core/src/be/howest/junglewars/gameobjects/GameObject.java

@@ -1,13 +1,11 @@
 package be.howest.junglewars.gameobjects;
 
-import be.howest.junglewars.screens.GameScreen;
-import com.badlogic.gdx.graphics.g2d.Sprite;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Rectangle;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import be.howest.junglewars.screens.*;
+import com.badlogic.gdx.graphics.g2d.*;
+import com.badlogic.gdx.math.*;
+
+import java.io.*;
+import java.util.*;
 
 public abstract class GameObject implements Serializable {