merge with key-master
add clear btn to user search
Merge branch 'user-search' into staging