Merge branch 'master' into various_bugs

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

app/models/user/user.rb

@@ -35,7 +35,8 @@ class User
   before_save :save_roles
   scope :remote_account, where(:nccu_id.ne => nil)
 
-  validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
+  # validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
+  
   # def new_attribute_values=(vars)
   #   binding.pry
   # end
@@ -176,7 +177,7 @@ class User
   end
   
   def initialize_desktop
-    self.build_desktop
+   self.build_desktop(desktop_widget_ids: DesktopWidget.all.collect{|widget| widget.id})
   end
   
   protected