Changelog for #230
Merge branch 'master' of github.com:openseadragon/openseadragon

Fixed Conflicts:
	changelog.txt