update scaffold
Update translation_ja.yml
Update translation_ja.yml
Merge branch 'master' into feature/prospects2

Conflicts:
	db/schema.rb
Merge branch 'feature/prospects2'