Merge branch 'master' into firestore

Author: samtstern

README.md

@@ -91,7 +91,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
-| 2.3.0              | 11.2.0                         |
+| 2.3.0              | 11.0.4                         |
 | 2.2.0              | 11.0.4                         |
 | 2.1.1              | 11.0.2                         |
 | 2.0.1              | 11.0.1                         |

auth/README.md

@@ -102,7 +102,7 @@ If support for Twitter Sign-in is also required, define the resource strings
 `twitter_consumer_key` and `twitter_consumer_secret` to match the values of your
 Twitter app as reported by the [Twitter application manager](https://apps.twitter.com/).
 
-```
+```xml
 <resources>
   <string name="twitter_consumer_key" translatable="false">YOURCONSUMERKEY</string>
   <string name="twitter_consumer_secret" translatable="false">YOURCONSUMERSECRET</string>