merge panada-adminkit3