多张图片上传
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/user.rb
验证