Add composer files
Merge origin/master