FWK-52 : Update paths for composer version
Update autoloader
Update composer.json
Merge remote-tracking branch 'origin/master'