detail edit page done
merged master into wenting-admin