migrate to Rails 4.0 (closes foodcoops#214)

Conflicts:
	Gemfile.lock

app/models/supplier.rb

@@ -1,14 +1,13 @@
 # encoding: utf-8
 class Supplier < ActiveRecord::Base
-
-  has_many :articles, :conditions => {:type => nil},
-    :include => [:article_category], :order => 'article_categories.name, articles.name'
-  has_many :stock_articles, :include => [:article_category], :order => 'article_categories.name, articles.name'
+  has_many :articles, -> { where(:type => nil).includes(:article_category).order('article_categories.name', 'articles.name') }
+  has_many :stock_articles, -> { includes(:article_category).order('article_categories.name', 'articles.name') }
   has_many :orders
   has_many :deliveries
   has_many :invoices
   belongs_to :shared_supplier  # for the sharedLists-App
 
+  include ActiveModel::MassAssignmentSecurity
   attr_accessible :name, :address, :phone, :phone2, :fax, :email, :url, :contact_person, :customer_number,
                   :delivery_days, :order_howto, :note, :shared_supplier_id, :min_order_quantity
 
@@ -82,8 +81,8 @@ class Supplier < ActiveRecord::Base
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    supplier = Supplier.where('suppliers.name = ?', name)
-    supplier = supplier.where('suppliers.id != ?', self.id) unless new_record?
+    supplier = Supplier.where(name: name)
+    supplier = supplier.where.not(id: self.id) unless new_record?
     if supplier.exists?
       message = supplier.first.deleted? ? :taken_with_deleted : :taken
       errors.add :name, message