Resolved merge conflicts
Resolved merge conflicts

HyungJon/HubTurbo,gaieepo/HubTurbo,Sumei1009/HubTurbo,ianngiaw/HubTurbo,Honoo/HubTurbo,gaieepo/HubTurbo,Sumei1009/HubTurbo,saav/HubTurbo,ianngiaw/HubTurbo,Honoo/HubTurbo,saav/HubTurbo,HyungJon/HubTurbo