Merge branch 'master' of https://github.com/nmontesdeoca/cargas-client
a little bit of configuration plus test new design
fix conflicts