Added admin panel (only visible if logged in as management)
Merge origin/master
Merge origin/master