Balance changes for Jibrail's master plan
Merge branch 'master' of https://github.com/AlexHayton/NS2Combat

Conflicts:
	output/Version.lua