up9
automatic merge
Merge https://github.com/23edson/re-cmt-bdii

Conflicts:
	Buffer.h
remove buffer.h anterior