25036 Implement admin area
Merge remote-tracking branch 'origin/master'