Merge remote-tracking branch 'origin/master'
# Conflicts:
# message/hardware_message.pb.cc
# message/hardware_message.pb.h
# message/hardware_message.proto
# message/locate_message.pb.h
# message/locate_message.proto
# message/measure_message.pb.cc
# message/message_base.pb.cc
# message/message_base.pb.h
# message/message_base.proto