admin: changes index file
Merge branches 'admin' and 'master'