Clean up phpDocumentor errors.
Merge branch 'master' of https://github.com/joomla/joomla-framework
Merge branch 'master' of github.com:joomla/joomla-framework into gh-pages
Updating API Docs