Location - category fixes

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

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">