Merge remote-tracking branch 'Empty2k12/feature/matrix-notifications' into feature/matrix-notifications

# Conflicts:
#	src/languages/en.js

src/components/notifications/Matrix.vue

@@ -15,10 +15,10 @@
     <div class="form-text">
         <span style="color: red;"><sup>*</sup></span>Required
         <p style="margin-top: 8px;">
-            You can find the internal room ID by looking in the advanced section if your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
+            You can find the internal room ID by looking in the advanced section of the room settings in your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
         </p>
         <p style="margin-top: 8px;">
-            It is highly recommended you create a new user and do not use your Matrix user's access token as it will allow full access to the matrix user. You can get the access token by running <code>curl -XPOST -d '{"type":"m.login.password", "identifier": {"user":"botusername", "type": "m.id.user"}, "password":"passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+            It is highly recommended you create a new user and do not use your own Matrix user's access token as it will allow full access to your account and all the rooms you joined. Instead, create a new user and only invite it to the room that you want to receive the notification in. You can get the access token by running <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
         </p>
     </div>
 </template>