Adjusted scaling for scattershot and lightfist
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orbion/Assets/Scripts/isFistShockwave.cs
Merge remote-tracking branch 'origin/master'