admin components update, staff update
Merge remote-tracking branch 'origin/master'