Merge remote-tracking branch 'origin/master' into story/105855968-directo

# Conflicts:
#	Gemfile
#	Gemfile.lock

app/views/admin/account_activities/index.haml

@@ -45,7 +45,7 @@
   .col-md-3
   .col-md-2
   .col-md-4{class: 'text-right'}
-    = t(:starting_balance)  + " #{@sum.to_a.map(&:sum).sum.to_f} EUR"
+    = t(:starting_balance)  + " #{@sum.to_f} EUR"
 
 %hr
 
@@ -66,10 +66,10 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'sum')
         %tbody
-          -total = @sum.to_a.map(&:sum).sum.to_f
+          -total = @sum.to_f
           - @account_activities.each do |x|
             %tr
-              %td= link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar))
+              %td= x.account.registrar && link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar))
               %td= x.description.present? ? x.description : '-'
               %td= x.activity_type ? t(x.activity_type) : ''
               %td= l(x.created_at)

app/views/admin/contacts/index.haml

@@ -59,7 +59,13 @@
           .form-group
             = label_tag t(:results_per_page)
             = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
-        .col-md-3{style: 'padding-top: 25px;'}
+        .col-md-3
+          .form-group
+            = label_tag :only_no_country_code, "Ident CC missing"
+            = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), style: 'width:auto;height:auto;float:right'
+
+      .row
+        .col-md-3{style: 'padding-top: 25px;float:right;'}
           %button.btn.btn-primary
              
             %span.glyphicon.glyphicon-search