Merge service-layer + admin-panel
Merge remote-tracking branch 'origin/service-layer' into service-layer