update documentation
Merge branch 'refs/heads/master' into 2.3
update the composer file to use more stable versions of bundles where possible