Merge branch 'master' into features/publicity

# Conflicts:
#	.gitignore

app/views/supporters/new.slim

@@ -23,8 +23,6 @@
             dd == t("age_category.#{current_supporter.age_category}")
             dt = Supporter.human_attribute_name(:language)
             dd = t("languages.#{current_supporter.language}")
-            dt = Supporter.human_attribute_name(:unsubscribed)
-            dd = current_supporter.unsubscribed? ?  t('shared.yes') : t('shared.no')
       
           p
             = link_to t('.edit'), edit_supporter_registration_path(), class: 'pull-right'

app/views/supporters/registrations/edit.html.slim

@@ -19,7 +19,6 @@
         = f.input :support, as: :radio_buttons, collection: t('support_type').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
         = f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first
         = f.input :language, as: :radio_buttons, collection: t('languages').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
-        = f.input :unsubscribed, as: :boolean 
       .form-actions
         = f.button :submit, t("devise.registrations.edit.update"), class: 'btn btn-primary'
     p = link_to t("devise.shared.links.back"), :back