Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml

app/src/main/AndroidManifest.xml

@@ -10,6 +10,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".PersonalityCenterActivity" />
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".RegisterActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java

@@ -21,6 +21,7 @@ public class PersonalityCenterActivity extends AppCompatActivity {
                 Intent intent=new Intent();
                 intent.setClass(PersonalityCenterActivity.this,LoginActivity.class);
                 startActivity(intent);
+                System.out.println("点击个人中心的登录按钮");
             }
         });
     }