Merge branch 'develop' into element_3483

Riot/SupportingFiles/Info.plist

@@ -91,5 +91,9 @@
 	<string>${PRODUCT_NAME}-Defaults</string>
 	<key>applicationGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
+	<key>baseBundleIdentifier</key>
+	<string>$(BASE_BUNDLE_IDENTIFIER)</string>
+	<key>keychainAccessGroup</key>
+	<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 </dict>
 </plist>

Riot/SupportingFiles/Riot-Bridging-Header.h

@@ -18,3 +18,5 @@
 #import "RoomBubbleCellData.h"
 #import "MXKRoomBubbleTableViewCell+Riot.h"
 #import "UserEncryptionTrustLevel.h"
+#import "BubbleReactionsViewSizer.h"
+#import "RoomEncryptedDataBubbleCell.h"

Riot/SupportingFiles/Riot.entitlements

@@ -40,7 +40,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 	</array>
 </dict>
 </plist>