Merge
Merge branch 'master' of https://github.com/moresun/transitbuddy

Conflicts:
	transitbuddy_human_publisher/src/humanflow_bridge_node.cpp