merge starter kit CONT
admin template update