Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock

app/views/finance/balancing/new.html.haml

@@ -12,7 +12,7 @@
   .well.well-small
     %h3= t('.notes_and_journal')
     #note
-      - unless @order.note.empty?
+      - unless @order.note.blank?
         = simple_format @order.note
       - else
         %p= t('.comment_on_transaction') 

app/views/finance/ordergroups/_ordergroups.html.haml

@@ -5,7 +5,7 @@
   %thead
     %tr
       %th= sort_link_helper t('.name'), "name", :per_page => @per_page
-      %th Kontakt
+      %th= t '.contact'
       %th.numeric= sort_link_helper t('.account_balance'), "account_balance", :per_page => @per_page
       %th
   %tbody
@@ -17,4 +17,4 @@
         %td
           = link_to t('.new_transaction'), new_finance_ordergroup_transaction_path(ordergroup), class: 'btn btn-mini'
           = link_to t('.account_statement'), finance_ordergroup_transactions_path(ordergroup), class: 'btn btn-mini'
-        
+