Merge remote-tracking branch 'origin/DavidBranch' into MaxBranch

Conflicts:
	src/rts/core/engine/Engine.java
	src/rts/views/CreateView.java
Merge remote-tracking branch 'origin/DavidBranch' into MaxBranch

Conflicts:
	src/rts/core/engine/Engine.java
	src/rts/views/CreateView.java
Merge remote-tracking branch 'origin/DavidBranch' into MaxBranch

Conflicts:
	src/rts/core/engine/Engine.java
	src/rts/views/CreateView.java
Merge remote-tracking branch 'origin/DavidBranch' into MaxBranch

Conflicts:
	src/rts/core/engine/Engine.java
	src/rts/views/CreateView.java
Latest Changes
Merge remote-tracking branch 'origin/master' into MaxBranch
Changed the back button to transition to the Profile Menu
Added changes to attack script
Merge remote-tracking branch 'origin/AustinBranch' into MaxBranch
Merge remote-tracking branch 'origin/AustinBranch' into MaxBranch
Merge branch 'AustinBranch' into MaxBranch
make run button work
fixed crap
updated lua scripts
Ignored files ending in ~
Merge branch 'Trung' into GregBranch

Conflicts:
	src/org/luawars/LuaJScripting/CallLua.java
Merge branch 'GregBranch' into AustinBranch
Added the save button to jEdit