Merge branch 'master' of http://git.fast-fun.cn:92/Chenjie/BatterySwap

# Conflicts:
#	System/Vehicle/Communication/CANNet.c