changed something
Merge branch 'master' of https://github.com/NothingBetterThanUS/BMW

Conflicts:
	script_aws/bus_data_generator/test/BusInfoTest.py