Buggfix kollision (inte klar)s
Merge branch 'master' into Robbin
buggfix (inte klar)
Merge branch 'master' into Robbin
Buggfix bortkommenterad (pga nya buggar) + reset() i units
Merge branch 'Robbin'