fix
Merge branch 'master' of https://github.com/AlloyTeam/AlloyPhoto

Conflicts:
	js/combined/alloyimage.js
添加多线程支持