fixed crap
updated lua scripts
Ignored files ending in ~
Merge branch 'Trung' into GregBranch

Conflicts:
	src/org/luawars/LuaJScripting/CallLua.java
repair/cancel luascript
Merge branch 'GregBranch' into MaxBranch

Conflicts:
	jEdit
	resources/Lua Scripts/myScript.lua
	src/org/luawars/LuaJScripting/CallLua.java
	src/rts/core/engine/PlayerInput.java
BIZZARE ASS SHIT WTF