iterator
Merge branch 'master' of https://github.com/lingeast/dbms

Conflicts:
	src/rbf/rbfm.h