[#44584671] added code for admin panel
[#44584671] Resolved conflicts and merged master