bugs fixing
Merge branch 'index'
Add iterator in index manager
Try to merge buffer manager
Merge buffer manager from 2 devs