Catalog Test
Catalog change
BufferPool commit
Small fixes
changes
Merge branch 'catalogtest'
Fixed merge crap
Another merge fix
Merge fixx