fix mp3 player
implement search on main activity
merge