Added Xobni
fixed conflict and removed trailing comma
Merge branch 'LeGaS-master'