Fox merge conflict & merge from kangfend

Merge models dan admin dari kangfend & fix merge conflict secara manual