Fixed broken viewer.raiseEvent calls in drawer.js
DZI-JSONp test now works; enabled
Generalized test timeout code
Merge pull request #64 from heathn/getString-error

Fix a problem with getString when the string property is a sub-property.
Merge branch 'master' of github.com:openseadragon/openseadragon

Fixed Conflicts:
	test/test.html
Updated changelog
Merge remote branch 'upstream/master'