fixed eco calculation
fixed units not added to army when produced by factory
Merge branch 'master' of https://github.com/LostMekka/SpiceWars.git