Local versioning
Re-added hotfix-phpdoc and feature-xxx changes

were lost in last merge for the `file schema-creator.php`
Local versioning
Merge branch 'develop' into feature-shortcodes

Conflicts:
	schema-creator.php