Search functionality
Merge with master
renamed activity