Update composer.json
Merge branch 'master' of github.com:nanapi/cakephp-redis

Conflicts:
	composer.json