ServerOnly build mode
Merge remote-tracking branch 'jw/master'
higher decal
Merge remote-tracking branch 'tom/master'
fixed if bug