added buffered updating records during deduplication
removed commented parts
Merge remote-tracking branch 'origin/bufferedStoring'

Conflicts:
	classes/RecordManager.php