Merging back from development fixed branch to master

Accidentally, we've included the composer vendor directory into the repository - resolved