...
Merge branch 'android' of https://github.com/Fareroo7/SmartRobot.git
into android