Merge branch 'balance' of https://github.com/ZeroK-RTS/Zero-K

Conflicts:
	units/amphraider3.lua
Attempting to fix conflict
Merge branch 'master' of https://github.com/RyMarq/Zero-K