fixed search controller bug on song query
fix conflict
Merge branch 'master' into test/helpers/songs_helper