Updated composer.json
Merge branch 'develop' of https://github.com/skaven/zf2-playground into develop

Conflicts:
	composer.json