Merge branches 'version3' and 'temp5' into version3
changed approach and search states, added enum for vision states