Admin page setup, basic functionality
Merge branches 'master' and 'dev'