api reference fix for plugins in plugins
fixes #1351
Merge pull request #1698 from digi604/api_changes

api reference docs fix for plugins in plugins
Merge remote-tracking branch 'origin/pr/1699' into develop
Merge branch 'develop' into i18n_placeholders

Conflicts:
	cms/admin/placeholderadmin.py