Fix phpdoc package
Fix composer dependencies
Merge branch 'develop' into feature/tree-model-category
Change category.pull according to the new protocol
Change global_data.pull according to the new protocol
Merge branch 'feature/tree-model-category' into develop