Merge branch 'admin_panel_picturebox'