Voting
Searching, playsong, etc
resolved conflicts
Merge branch 'damemi-master'