Merge pull request #338 from jeroenpraat/patch-4

Updating instances website and project website

app/src/main/res/values/strings.xml

@@ -127,12 +127,12 @@
 
     <string name="dialog_whats_an_instance">The address or domain of any instance can be entered
         here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
-        <a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md">more!</a>
+        <a href="https://instances.social">more!</a>
         \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
         join and create an account there.\n\nAn instance is a single place where your account is
         hosted, but you can easily communicate with and follow folks on other instances as though
         you were on the same site.
-        \n\nMore info can be found at <a href="https://mastodon.social/about">mastodon.social</a>.
+        \n\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>.
     </string>
     <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
     <string name="dialog_message_uploading_media">Uploading…</string>