Merge pull request #102 from SE2-Mankomania-SS20/develop

Sprint 2 ende

.gitignore

@@ -131,3 +131,7 @@ Thumbs.db
 !/ios-moe/xcode/*.xcodeproj/xcshareddata
 !/ios-moe/xcode/*.xcodeproj/project.pbxproj
 /ios-moe/xcode/native/
+
+## exclude json resource that is shared on client and server - will be copied from android/assests
+/server/src/main/resources/*
+/core/src/main/resources/*

android/AndroidManifest.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mankomania.game" >
+          package="com.mankomania.game" >
     <uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:isGame="true"
-        android:appCategory="game"
-        android:label="@string/app_name"
-        android:theme="@style/GdxTheme" >
+            android:allowBackup="true"
+            android:icon="@drawable/ic_launcher"
+            android:isGame="true"
+            android:appCategory="game"
+            android:fullBackupContent="false"
+            android:label="@string/app_name"
+            android:theme="@style/GdxTheme" >
         <activity
-            android:name="com.mankomania.game.android.AndroidLauncher"
-            android:label="@string/app_name" 
-            android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
+                android:name="com.mankomania.game.android.AndroidLauncher"
+                android:label="@string/app_name"
+                android:screenOrientation="landscape"
+                android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />