Correct the docblock for stream action links
Merge pull request #607 from johnbillion/object_record

Correct the docblock for stream action links
Merge remote-tracking branch 'xteam/develop' into xteam-develop-merge and standardize docblocks

Conflicts:
	connectors/editor.php
Merge branch 'xteam-develop-merge' into develop