Modified Admin Page
Merge branches 'master' and 'whitegold'