Location - category fixes

Conflicts:
	app/models/category.rb
	vendor/built_in_modules/location/init.rb

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

@@ -6,6 +6,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def index
     @location_infos = LocationInfo.all
+    @categories = get_categories_for_index
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @locations }
@@ -14,6 +15,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def new
     @location_info = LocationInfo.new
+    @categories = get_categories_for_index
 
     respond_to do |format|
       format.html # new.html.erb