Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml

Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml

@@ -9,14 +9,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LeudaemiaLikeMe">
-<<<<<<< HEAD
+        <activity android:name=".Activity.SendInvitationActivity"></activity>
-        <activity android:name=".SendInvitationActivity"></activity>
-        <activity android:name=".MainActivity">
-=======
         <activity android:name=".Activity.GoAnswerActivity"></activity>
         <activity android:name=".Activity.SendQuestionActivity" />
         <activity android:name=".Activity.MainActivity">
->>>>>>> origin/master
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java

@@ -1,9 +1,11 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Activity;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.leudaemialikeme.R;
+
 public class SendInvitationActivity extends AppCompatActivity {
 
     @Override

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_invitation.xml

@@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:orientation="vertical"
-    tools:context="com.example.leudaemialikeme.SendInvitationActivity" >
+    tools:context="com.example.leudaemialikeme.Activity.SendInvitationActivity" >
 
 <LinearLayout
     android:layout_width="match_parent"