the Chinese I18n was updated
Merge branch 'master' of https://github.com/TrainingCourse/13-Web-113

Conflicts:
	db/schema.rb