Work on the XCF Tab Gui
Merge branch 'master' into bombs

Conflicts:
	lua.zip