[Ovmsdev] Merging in Twizy and Volt/Ampera work