modify upload logic code and optimize uploaded file
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/bll/imageBLL.js