add admin.html
Merge branch 'admin'

A new merge.