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

PhpDocs and TODO comments