merge upstream and small changes

Signed-off-by: Zoey <zoey@z0ey.de>

backend/models/token.js

@@ -73,13 +73,6 @@ module.exports = function () {
 
 							} else {
 								token_data = result;
-
-								// Hack: some tokens out in the wild have a scope of 'all' instead of 'user'.
-								// For 30 days at least, we need to replace 'all' with user.
-								if ((typeof token_data.scope !== 'undefined' && _.indexOf(token_data.scope, 'all') !== -1)) {
-									token_data.scope = ['user'];
-								}
-
 								resolve(token_data);
 							}
 						});