modified:   app/views/goldencobra_newsletter/newsletters/_register.html.erb
	modified:   lib/goldencobra_newsletter/engine.rb
Merge branch 'master' of github.com:ikusei/Goldencobra_Newsletter
bundle update goldencobra/activeadmin.
link to archive removed
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_subscription.html.erb
	modified:   test/dummy/features/newsletter.feature
fallback view when unsubscribing and no record is found
	modified:   app/controllers/goldencobra_newsletter/newsletters_controller.rb
	new file:   app/views/goldencobra_newsletter/newsletters/no_registration_found.html.erb
	modified:   config/locales/de.yml
	modified:   config/locales/en.yml
	new file:   test/dummy/spec/controllers/newsletters_controller_spec.rb
	modified:   test/dummy/spec/models/newsletter_registration_spec.rb
view adjustments
	modified:   app/views/goldencobra_newsletter/newsletters/no_registration_found.html.erb
bundle update goldencobra
	modified:   Gemfile.lock
[#31003931] double opt_in done.
	modified:   Gemfile.lock
	modified:   app/controllers/goldencobra_newsletter/newsletters_controller.rb
	modified:   app/mailers/goldencobra_newsletter/newsletter_mailer.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_cancel_subscription.html.erb
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_subscription.html.erb
	new file:   app/views/goldencobra_newsletter/newsletter_mailer/double_opt_in.html.erb
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/email_with_template.html.erb
	modified:   config/locales/de.yml
	modified:   config/locales/en.yml
	modified:   test/dummy/spec/mailers/newsletter_mailer_spec.rb
fixed newsletter feature
	modified:   test/dummy/features/newsletter.feature
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_subscription.html.erb
repaired links in emails
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/double_opt_in.html.erb
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/email_with_template.html.erb
	modified:   app/views/goldencobra_newsletter/newsletter_mailer/email_with_template.text.erb
added css style informations in mailer
	modified:   app/mailers/goldencobra_newsletter/newsletter_mailer.rb
neue seiten fuers frontend
	modified:   app/controllers/goldencobra_newsletter/newsletters_controller.rb
	new file:   app/views/goldencobra_newsletter/newsletters/subscribe.html.erb
	new file:   app/views/goldencobra_newsletter/newsletters/unsubscribe.html.erb
	modified:   config/locales/de.yml
	modified:   config/locales/en.yml
	modified:   app/controllers/goldencobra_newsletter/newsletters_controller.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb
	modified:   app/views/goldencobra_newsletter/newsletters/register.js.erb
	modified:   admin/newsletter_registrations.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb
Merge branch 'master' of github.com:ikusei/Goldencobra_Newsletter
	modified:   admin/newsletter_registrations.rb
text versionen aller emails
	new file:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_cancel_subscription.text.erb
	new file:   app/views/goldencobra_newsletter/newsletter_mailer/confirm_subscription.text.erb
	new file:   app/views/goldencobra_newsletter/newsletter_mailer/double_opt_in.text.erb
	modified:   Gemfile.lock
	modified:   admin/newsletter_registrations.rb
	modified:   app/models/goldencobra_newsletter/newsletter_registration.rb