微网页提交(2014-12-23)
Merge remote-tracking branch '99/master'

Conflicts:
	app/modules/wwy/main.js
修复单个图片上传问题
Merge branch 'jhw'
wyj
wyj
wyj