JSON lin Added
Merge branch 'master' of github.com:misaelpc/client-api
Merge