Merge branch 'master' into master-to-rails3

Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb

app/views/articles/index.haml

@@ -45,4 +45,4 @@
 
 = form_tag update_selected_supplier_articles_path(@supplier), id: "articlesInListForm",
   'data-submit-onchange' => true do
-  #table= render 'articles'
+  #table= render 'articles'

app/views/group_orders/_form.html.haml

@@ -16,6 +16,8 @@
     - unless @order.note.blank?
       %dt Notiz
       %dd= @order.note
+    %dt Erstellt von
+    %dd= link_to_user_message_if_valid(@order.created_by)
     %dt Ende
     %dd= format_time(@order.ends)
     - unless @order.stockit? or @order.supplier.min_order_quantity.blank?

app/views/messages/new.haml

@@ -32,8 +32,12 @@
     %small{:style => "color:grey"}
       Eventuell musst Du Dich dem Verteiler erst bekannt machen.
       %br/
-      z.b. mit einer Mail an
-      = mail_to FoodsoftConfig[:mailing_list_subscribe]
+      - if Foodsoft.config[:mailing_list_subscribe].blank?
+        Erklärungen zum Verteiler findest Du im
+        = link_to 'Wiki (Abschnitt Mailing-Liste)', wiki_page_path('MailingListe')
+      - else
+        z.b. mit einer Mail an
+        = mail_to Foodsoft.config[:mailing_list_subscribe]
 
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json }

app/views/orders/show.html.haml

@@ -8,17 +8,17 @@
   %dl.dl-horizontal
     %dt Lieferantin
     %dd= @order.name
-    %dt Notiz
-    %dd= @order.note
+    - if @note.present?
+      %dt Notiz
+      %dd= @order.note
+    %dt Erstellt von
+    %dd= link_to_user_message_if_valid(@order.created_by)
     %dt Beginn
     %dd= format_time(@order.starts)
     %dt Ende
     %dd= format_time(@order.ends)
     %dt Gruppenbestellungen:
-    %dd
-      = @order.group_orders.count
-      = "[#{@order.group_orders.includes(:ordergroup).all.collect{|g| g.ordergroup.name}.join(', ')}]"
-      
+    %dd #{@order.group_orders.count} (#{@order.group_orders.includes(:ordergroup).all.map {|g| g.ordergroup.name}.join(', ')})
     %dt Netto/Bruttosumme aller Artikel:
     %dd= "#{number_to_currency(@order.sum(:net))} / #{number_to_currency(@order.sum(:gross))}"
     %dt Bestellte Artikel: