lots of admin changes
lots of changes for admin
Merge remote-tracking branch 'upstream/master'
admin home and menu