client = =
Merge branch 'dev' of https://github.com/plumer/diki.git into dev
modify client and entry 12.13
complete search and display