authors fix in composer
Merge remote-tracking branch 'origin/develop' into develop
namespaces and other fixes