activation-sms
edit placeholder
Merge branch 'develop' into feature/activation-sms

Conflicts:
	app/controllers/activations_controller.rb
	app/models/account_activation.rb
	app/services/user_activator.rb
	app/views/activations/new.html.erb
	spec/acceptance/kakao_auth_spec.rb
Merge pull request #282 from DonutWorks/feature/activation-sms

activation-sms