Merge pull request #11 from xthiago/2.1-dev

Remove composer.lock e ajusta dependências do composer.json