ewsrf

Signed-off-by: Johan <johanfredriksson1987@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	ShinyBearToolKit/MenuEditor/FormTextureAtlas.Designer.cs
	ShinyBearToolKit/MenuEditor/FormTextureAtlas.cs