fixed composer.json
Merge branch 'composer' of https://github.com/oh240/Cakephp2_AWS_S3_DataSource into composer

Conflicts:
	composer.json