refactor to comply with pep8
refactor to comply with pep8
refactor to comply with pep8
Merge remote-tracking branch 'origin/master'

Conflicts:
	objects/vehicle/basevehicle.py
refactor to comply with pep8