Add admin_notes to spaces and activities edit forms for admins to add
Merge branch 'master' into AdminExtra