Merge branch 'develop' into standalone_develop

app/controllers/settings_controller.rb

@@ -11,13 +11,10 @@ class SettingsController < ApplicationController
 
   private
     def get_navbar 
-      @navbar = []
-      default_laboratory.navbar.each do |site|
-        hash = {}
-        site.each {|k, v|
-          hash.merge!("#{k}":  get_site_url(k, v))
-        }
-        @navbar << hash
+      @navbar = default_laboratory.navbar
+      if User.current.logged?
+        pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
+        @navbar << pernal_index
       end
     end