CS Fixes
Add missing App::uses(), docblocks and formatting

Closes GH-182
Removing 'PHP version 5' from docblock
Merge branch 'master' into 1.6

Conflicts:
	Acl/Controller/Component/RowLevelAclComponent.php
CS Fixes
Fix: Incorrect placement of return

Ref: 99e5e0fcf8bbfffd7851f1e4543da3baa2cb8dea
Update docblocks and apigen.conf