Fix type
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
Customized edit view & improved pixlr integration
Moved button to box header
Merge pull request #526 from Bladrak/adminEdit

Customized edit view & improved pixlr integration
Delete correct route
Merge pull request #528 from Bladrak/showRoute

Delete correct route
Added metadata to media providers
Added unit test
Updated metadata implementation
Merge pull request #529 from Bladrak/metadata

Added metadata to media providers
Merge branch 'master' into updateGallery

Conflicts:
	CHANGELOG.md