WM
Merge branch 'v1.0' of github.com:NosicLin/FSpriteDesigner into v1.0

Conflicts:
	resource/images/Thumbs.db
Merge branch 'v1.0' of github.com:NosicLin/FSpriteDesigner into v1.0