Merge branch 'master' into unsuscribe

Conflicts:
	app/modules/suscribir/suscribible.rb
	spec/modules/suscribir/suscribible_spec.rb