Added composer.json

Signed-Off-By : Grégory PLANCHAT <g.planchat@gmail.com>
Updated Docblocks

Signed-Off-By : Grégory PLANCHAT <g.planchat@gmail.com>
Merge remote branch 'origin/master'