Fix image_upload directive: Hide remove image button when default image is shown
Merge branch 'master' of git://github.com/undf/ExtraFormBundle