[UPD]修改上传
Merge branch 'master' of https://github.com/isleon/flea-market

Conflicts:
	private/bll/image.js
	routes/image.js