Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml

app/views/layouts/_side_bar_content.html.erb

@@ -1,8 +1,10 @@
+<%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
+  <%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
+<%# end -%>
 <% content_for :page_specific_javascript do %>
   <%= javascript_include_tag "/static/kernel.js"  %>
 <% end %>
 
-
 <%OrbitApp::Module::SideBarRegisition.all.each do |t| %>
   <%= t.render(request,params,current_user,@module_app) %>
 <% end %>