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/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 }