Merge branch 'story/105855968-directo' into staging

# Conflicts:
#	config/locales/en.yml

app/views/admin/registrars/_form.haml

@@ -84,9 +84,9 @@
               = f.text_field(:code, class: 'form-control', disabled: !f.object.new_record?)
           .form-group
             .col-md-4.control-label
-              = f.label :exclude_in_monthly_directo
+              = f.label :test_registrar
             .col-md-7
-              = f.check_box :exclude_in_monthly_directo, class: 'form-control'
+              = f.check_box :test_registrar, class: 'form-control'
 
   %hr
   .row

app/views/admin/registrars/index.haml

@@ -14,12 +14,15 @@
               = sort_link(@q, 'reg_no', t(:reg_no))
             %th{class: 'col-xs-4'}
               = t(:credit_balance)
+            %th{class: 'col-xs-4'}
+              = t(:test_registrar)
         %tbody
           - @registrars.each do |x|
             %tr
               %td= link_to(x, [:admin, x])
               %td= x.reg_no
               %td= "#{x.balance}"
+              %td= "#{x.test_registrar}"
 .row
   .col-md-12
     = paginate @registrars