diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99ea593..a1cd169 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,25 +4,26 @@
     package="com.example.cosmosclient">
     <!-- ここからバーコードリーダーのアクセス許可 -->
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
-    </uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 
     <application
         android:name=".app.Cosmos"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
+            android:name=".views.MakeGroupActivity"
+            android:label="グループ作成"></activity>
+        <activity
             android:name=".views.JoinGroupByIDActivity"
-            android:label="IDでグループに入る"
-            />
+            android:label="IDでグループに入る" />
         <activity
             android:name=".views.JoinGroupActionsActivity"
             android:label="グループに入る" />
@@ -33,9 +34,9 @@
         <activity
             android:name=".views.QRcodeReadingActivity"
             android:screenOrientation="portrait"
-            tools:replace="screenOrientation">
-        </activity>
-        <activity android:name=".views.SigninActivity"
+            tools:replace="screenOrientation"></activity>
+        <activity
+            android:name=".views.SigninActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -43,12 +44,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".views.SignupActivity"
-            android:theme="@style/AppTheme.NoActionBar"/>
+        <activity
+            android:name=".views.SignupActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".views.ForgotPasswordActivity"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
-        <activity android:name=".MainActivity"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".MainActivity" />
         <activity
             android:name=".views.RequestListActivity"
             android:label="@string/title_activity_request_list"
@@ -65,8 +67,7 @@
         <activity
             android:name=".views.GroupListActivity"
             android:label="@string/title_activity_group_list"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
index 63fd1cc..981bcb0 100644
--- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
+++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
@@ -9,19 +9,14 @@
 
 public class Cosmos extends Application {
     //token処理
-    private List<String> token;
+    private String token=null;
     private Group curGroup=null;
 
-    public Cosmos(){
-        this.token = new ArrayList<String>();
-    }
-
-    public void setToken(List<String> token){
+    public void setToken(String token){
         this.token = token;
     }
-
-    public List<String> getToken(){
-        return new ArrayList<String>(token);
+    public String getToken(){
+        return token;
     }
 
     //Group処理
diff --git a/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java
index 269b78a..38683ca 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java
@@ -1,7 +1,5 @@
 package com.example.cosmosclient.entities;
 
-import java.util.List;
-
 public class SigninResponse {
-    public List<String> token;
+    public String token;
 }
diff --git a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
index 4a52150..712e2fd 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
@@ -1,13 +1,10 @@
 package com.example.cosmosclient.entities;
 
-import java.util.List;
-
 public class SignupResponse {
     public String uId;
     public String name;
-    public String pw;
     public String uri;
-    public List<String> token;
+    public String token;
     public String iconUri;
     public boolean login;