corrected comments
Merge commit 'ea9ca9ad' into future

Conflicts:
	+dj/Table.m