Fix composer
Upgrade doc files
Merge branch 'feature/composer' into devel