adding administrative view overriding /admin/people
Merge remote-tracking branch 'origin/master'