Fix "FATAL ERROR: BR-Class485Front - More livery types (2) than liveries (2)!"
Fix "FATAL ERROR: BR-312-MBSO - More livery types (0) than liveries (0)!"
Merge branch 'master' of git@github.com:jamespetts/simutrans-pak128.britain.git into half-heights