Redesigned media show in admin & pixlr integration in modal
update composer.json
Merge pull request #524 from Bladrak/adminShow

Redesigned media show in admin & pixlr integration in modal
Merge remote-tracking branch 'sonata-project/master'

Conflicts:
	composer.json