PhpDocs and TODO comments
Merge pull request #4244 from tivnet/master

PhpDocs and TODO comments