Merge branch 'feature-listsearch'
Merge branch 'master' of https://github.com/teleject/amazingr