Updated GalleryBlockService to use bootstrap3 carousel
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
Merge pull request #521 from Bladrak/updateGallery

Updated GalleryBlockService to use bootstrap3 carousel
improve layout
Merge remote-tracking branch 'sonata-project/master'

Conflicts:
	Admin/BaseMediaAdmin.php