Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config

Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb

lib/parsers/parser_layout.rb

@@ -5,7 +5,7 @@ module ParserLayout
     body = Nokogiri::HTML(layout.body)
 
     body.css('.page_content').each do |content|
-      layout.layout_parts.build(:name => content['name'])
+      layout.layout_parts.build(:name => content['name']) unless layout.layout_parts.detect{|layout_part| layout_part.name.eql?(content['name'])}
     end
 
     body.css('.page_menu').each do |menu|