Added ifdef so balubu server could compile
Lots of unit fixes
Merge remote-tracking branch 'erik/master'
Does not crash if soundfile is not found