Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,8 @@
         <activity android:name=".Activity.SendInvitationActivity" />
         <activity android:name=".Activity.GoAnswerActivity" />
         <activity android:name=".Activity.SendQuestionActivity" />
+        <activity android:name=".Activity.APNActivity"/>
+        <activity android:name=".Activity.EventActivity"/>
         <activity android:name=".Activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />