Updating composer.json to update to the latest vendor files
Updating composer.phar ot latest version
Merge branch 'master' into dev