update
last changes
add hoppers search
update search
Merge branch 'roles_update'
resolve merge conflicts