now run "grunt admin" for the admin panel
Merge remote-tracking branch 'origin/master'