@redesign
Merge branch 'master' of github.com:FSource/FSprite-Designer2

Conflicts:
	FSpriteDesigner2.pro.user

@redesign