Include RecordManager
Merge remote-tracking branch 'origin/master'

Conflicts:
	API.cc
	API.h