added 4 more styles and self-defense training trait back in
Merge branch 'master' into martial_arts
Update martialarts.json

Accidentally deleted capoeira, added it back in
Add the blueprint for the armored car.
Remove mention of old vpart_id enum from code documentation.
Merge current state of translations: de fr ru zh_CN zh_TW and new ko.
Added support for multi-square doors, and converted trunks on cars and electric cars to use trunk doors.
Added shutter doors for vehicles, and a cube van.
Spawn cube van in a few places.
Merge martiall arts restore, multi-square vehicle doors, cube vans, armored cars, and a big heap of translations