Added feedback to admin panel
merge
title fix
Merge branch 'develop'