Updated AdBanner index page and Ad Image index page, and edit pages

Conflicts:
	vendor/built_in_modules/ad_banner/config/locales/en.yml
	vendor/built_in_modules/ad_banner/init.rb

config/routes.rb

@@ -45,13 +45,17 @@ Orbit::Application.routes.draw do
     match 'ad_banners/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
     match 'ad_banners/:id/rename' => 'ad_banners#rename',:as => :rename_ad_banner,:via => :post
 
-    resources :ad_banners do 
-      collection do
-        match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
-        match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
-      end
-      resources :ad_images ,:except => [:show]
-    end
+    match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
+    match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
+    resources :ad_images ,:except => [:show]
+
+    resources :ad_banners #do 
+    #  collection do
+    #    match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get
+    #    match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post
+    #  end
+    #  resources :ad_images ,:except => [:show]
+    #end
 
     match 'authorizations/add_roles/:module(/:type(/:id))' => 'authorizations#add_roles', :as => :add_roles_authorizations
     match 'authorizations/add_users/:module(/:type(/:id))' => 'authorizations#add_users', :as => :add_users_authorizations