migrate to Rails 4.0 (closes foodcoops#214)

Conflicts:
	Gemfile.lock

app/views/shared/_article_fields_price.html.haml

@@ -19,7 +19,7 @@
       = number_to_currency(f.object.fc_price) rescue nil
 
 -# do this inline, since it's being used in ajax forms only
-- field = f.object.class.model_name.underscore
+- field = f.object.class.model_name.to_s.underscore
 :javascript
   var form = $('#article_fc_price').closest('form');
   $('##{field}_price, ##{field}_tax, ##{field}_deposit', form).on('change keyup', function() {

app/views/shared/articles_by/_articles.html.haml

@@ -8,7 +8,7 @@
         %acronym{:title => t('shared.articles.received_desc')}= t 'shared.articles.received'
       %th= t 'shared.articles_by.price'
 
-  - for order_article in order.order_articles.ordered.all(:include => [:article, :article_price])
+  - for order_article in order.order_articles.ordered.includes([:article, :article_price])
     = render 'shared/articles_by/article_single', order_article: order_article, edit: (edit rescue nil)
     %tr
       %td{colspan: 4}

app/views/shared/articles_by/_group_single.html.haml

@@ -4,7 +4,7 @@
       %th{colspan: 9}
         %h4.name= group_order.ordergroup.name
   - total = 0
-  - for goa in group_order.group_order_articles.ordered.all(:include => :order_article)
+  - for goa in group_order.group_order_articles.ordered.includes(:order_article)
     - total += goa.total_price
     = render 'shared/articles_by/group_single_goa', goa: goa, edit: (edit rescue nil)
   %tr{class: cycle('even', 'odd', :name => 'articles')}