merge with november_presentation

app/controllers/admin/app_auths_controller.rb

@@ -4,7 +4,7 @@ class Admin::AppAuthsController < ApplicationController
   before_filter :is_admin?
   
   def index
-    @roles = Role.all.entries
+    @user_roles = UserRole.all.entries
     apps = Purchase.where(:type =>"App")
     @app_auth_data = apps.entries.map do |app|
       app_c = eval(app.app_controller)