Fixed admin notes
Merge branch 'master' into Fixing_admin_notes