semi-functioning admin panel up and running...
Merge remote-tracking branch 'origin/master'