Merge branch 'hotfix-settings'
PHP documentation tags fixed and filled

Updated the function headings to have correct PHP Documentation docs so
they can be processed. @returns does not exist. Added @return and @param
tags.
Merge branch 'hotfix-phpdoc' into develop