Merge branch 'design_team' into ldap

Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json

app/controllers/admin/module_apps_controller.rb

@@ -12,13 +12,16 @@ class Admin::ModuleAppsController < ApplicationController
   def reload_frontend_pages
     @categories =[]
     @module_app = ModuleApp.find(params[:id])
-    unless (@module_app.category.nil? rescue true)
-      @module_app.category.each do |category|
-        @categories << eval(category).all.entries
-      end
-      @categories.flatten!
-    else
-      @categories = nil
+    case @module_app.key
+      when 'announcement'
+        @categories =  BulletinCategory.all
+        @tags = AnnouncementTag.all
+      when 'news'
+        @categories =  NewsBulletinCategory.all
+        @tags = NewsTag.all
+      when 'web_resource'
+        @categories =  WebLinkCategory.all
+        @tags = WebResourceTag.all
     end
     respond_to do |format|
       format.js  {}