Merge branch 'develop' into standalone_develop

app/models/user.rb

@@ -796,14 +796,16 @@ class User < Owner
         trace_user.refresh_token
         trace_user.save
       end
+      return trace_user.token
     else
-      trace_user = TraceUser.new
+      tu = TraceUser.new
-      trace_user.build_self_data
+      tu.user = self
-      trace_user.build_token 
+      tu.build_self_data
-      trace_user.save
+      tu.build_token 
-    end
+      tu.save
 
-    trace_user.token
+      return tu.token
+    end
   end
 
   protected