Merge branch 'development' of https://github.com/Rulingcom/orbit into development

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -51,7 +51,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t(:category) %></label>
         <div class="controls">
-          <%= f.select :category, @categories.collect{|t| [ t.title, t.id ]} %>
+          <%= f.select :category_id, @categories.collect{|t| [ t.title, t.id ]} %>
         </div>
       </div>