few updates with fb integration and some other changes in user and supports data to android

Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb

vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb

@@ -2,7 +2,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
   include AdminHelper
 
   before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :create, :update, :delete]
-  before_filter :force_order_for_user,:except => [:get_locations,:index]
+  before_filter :force_order_for_user,:except => [:get_locations,:index,:get_categories]
 
   def index
     @location_infos = LocationInfo.all
@@ -74,6 +74,14 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
                  description: location.description }
     end
 
-    render :json => JSON.pretty_generate({location: @data})
+    render :json => JSON.pretty_generate(@data)
+  end
+
+  def get_categories
+    @data = Array.new
+     @data << { name: "Department",
+                link:  "http://#{request.host_with_port}"+"/panel/location/back_end/locations/get_locations?locale=en" }
+
+      render :json => JSON.pretty_generate(@data)
   end
 end

vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb

@@ -74,4 +74,11 @@ class Panel::Locations::BackEnd::LocationsController < OrbitBackendController
 
     #render :json => {location: @data}.to_json
   end
+  def get_categories
+    @data = Array.new
+     @data << { name: "Department",
+                link:  "http://#{request.host_with_port}"+"/panel/location/back_end/location/get_locations" }
+
+      render :json => JSON.pretty_generate(@data)
+  end
 end

vendor/built_in_modules/location/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
       namespace :back_end do 
 
         match "locations/get_locations" => "locations#get_locations"
+         match "locations/get_categories" => "locations#get_categories"
 
         resources :locations
       end