更新上传模块
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	index.html
	js/src/angularSrc/app.js