Sprite.setRegion() optional param
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/Win32/Release/x2d.lib