updated vehicle mode handling in CanControl
deleted .pro.user
Merge remote-tracking branch 'upstream/master'
fixed SOC conversion