updated admin module
Merge remote-tracking branch 'proj1/master'