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

Conflicts:
	combined/alloyimage.js