Merge branch 'hotfix/0.1.1'
Merge branch 'release/1.0'
Fix search button
Merge branch 'hotfix/search_button' into develop