Front end: search function works
Merge branch 'user' into design
not important