Added some fields to admin
Merge branch 'admin'