メール機能の実装、論理削除を考慮
Merge branch 'master' of https://github.com/LGDIS/LGDPF

Conflicts:
	app/models/person.rb