Fix links to photo user and photo edit in admin list view
Fix merge conflicts