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

vendor/built_in_modules/location/app/models/location.rb

@@ -1,6 +1,7 @@
 class Location
   include Mongoid::Document
   include Mongoid::Timestamps
+  include OrbitCategory::Categorizable
 
   mount_uploader :file, LocationUploader
 

vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb

@@ -23,6 +23,16 @@
       <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
     </div>
   </div>
+
+   <!-- Category -->
+  <div class="control-group">
+    <label class="control-label muted"><%= t(:category) %></label>
+    <div class="controls">
+      <%= f.select :category_id, @categories.collect{|t| [ t.title, t.id ]} %>
+    </div>
+  </div>
+
+
   <div class="control-group">
     <label class="control-label" for=""><%= t 'description' %></label>
     <div class="controls">