812 Commits (feature/admin-panel)