Add composer.json
Merge pull request #929 from hason/composer

Add composer.json
Merge branch '2.x' into 2.x_n