Fix category edit (background_image)
Merge remote-tracking branch 'origin/master'
Allow robots