admin changes commit
commit from master
Merge branch 'admin'