Merge branch 'develop'

src/Notes-master2/app/src/main/AndroidManifest.xml

@@ -44,9 +44,9 @@
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+            <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+        </intent-filter>
         </activity>
 
         <activity