Admin work in progress
Merge remote-tracking branch 'origin/master'
Admin pie charts work in progress