Removed hardcoded value for next upgrade damage, now dynamic
Merge branch 'Jonte'
Merge branch 'master' into Oskar