10/22
Merge remote-tracking branch 'upstream/master'

Conflicts:
	robot/animation.h
	robot/robot.cpp
Merge remote-tracking branch 'upstream/master'
eed
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	robot/robot.cpp
syntax and style
static function , menu