Merge pull request #2461 from hmhealey/teamdefault

Changed 'show username' display text to be more accurate

webapp/components/user_settings/user_settings_display.jsx

@@ -195,7 +195,7 @@ export default class UserSettingsDisplay extends React.Component {
         const showUsername = (
             <FormattedMessage
                 id='user.settings.display.showUsername'
-                defaultMessage='Show username (team default)'
+                defaultMessage='Show username (default)'
             />
         );
         const showNickname = (