Merge branch 'develop' into pre_trustie_server

app/controllers/settings_controller.rb

@@ -13,7 +13,7 @@ class SettingsController < ApplicationController
     def get_navbar 
       @navbar = default_laboratory.navbar
       if User.current.logged?
-        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false}
         @navbar << pernal_index
       end
     end