add uniform subdivision search class
finished up search structure
Merge branches 'collisions' and 'master'