Merge tag 'composer' into develop

adding composer.json
Merge branch 'mockiemockiz-composer' to master