Merge branch 'design_team' into ldap

app/controllers/admin/asset_categories_controller.rb

@@ -17,7 +17,6 @@ class Admin::AssetCategoriesController < OrbitBackendController
   
   def edit
     @asset_category = AssetCategory.find(params[:id])
-    @i18n_variable = @asset_category.i18n_variable	
     @url = admin_asset_categories_path(@asset_category)
   end
 

app/controllers/admin/infos_controller.rb

@@ -21,7 +21,6 @@ class Admin::InfosController < ApplicationController
   
   def edit
     @attribute = Info.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end
   

app/controllers/admin/roles_controller.rb

@@ -21,7 +21,6 @@ class Admin::RolesController < ApplicationController
   
   def edit
     @attribute = Role.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end