higher decal
Merge remote-tracking branch 'tom/master'
fixed if bug
Unit starting positions in corner