Add building_generator
Started collisions
Merge branch 'master' into test
Merge remote-tracking branch 'origin/test' into test
Started animations