12-4/添加多图上传
Merge remote-tracking branch 'origin/master'

Conflicts:
	angular_sites/views/fever-type.html
	angular_sites/views/shop.html