Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Zotlabs/Module/Settings/Tokens.php

@@ -161,8 +161,8 @@ class Tokens {
 			'$me' => t('My Settings'),
 			'$perms' => $perms,
 			'$inherited' => t('inherited'),
-			'$notself' => 0,
-			'$self' => 1,
+			'$notself' => 1,
+			'$self' => 0,
 			'$permlbl' => t('Individual Permissions'),
 			'$permnote'       => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'),
 			'$submit' 	=> t('Submit')
@@ -170,4 +170,4 @@ class Tokens {
 		return $o;
 	}
 	
-}
+}