updated composer
Merge branch 'master' of https://github.com/mawo1982/Zf2DealsTest

Conflicts:
	composer.phar