Add admin UI for theme approval, add image field to snippet for uploading/editing
Fix remaining merge conflict