添加保存上传图片功能
Merge branch 'master' of github.com:mingzhi22/html5dw

Conflicts:
	server/photo.client.js