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/views/admin/users_new_interface/edit.html.erb

@@ -14,7 +14,7 @@
 <% end -%>
 
 
-<%= content_tag :div,:class=>"user-role site-map"  do%>
+<%= content_tag :div,:class=>"user-role site-map role-block"  do%>
 
     <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
       <%= f.error_messages %>