Merge branch '3.3/master'
add composer.json
Merge branch 'master' into 3.3/master