Search & feedback development
Merge branch 'master' of https://github.com/tmn-tsogu-team/panda
merge