ticket:1 added admin
Merge branch 't1_enhancements'