Added composer.json
Merge branch 'develop'
Fix composer.json name

Changed vendor to be my username instead of cakephp
Merge branch 'master' into develop