Manual merge of vision
Merge branch 'Milestone-3' of http://github.com/TheiaRobo/Theia into Milestone-3
Checks for close objects. Helpmeimtrapped