Merge branch 'develop' into standalone_develop

app/models/user.rb

@@ -567,7 +567,8 @@ class User < Owner
     return '游客' unless logged?
     name = lastname + firstname
     name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    # name.gsub(/\s+/, '').strip    #6.11 -hs
+    name.strip
   end
 
   def only_real_name