Playing a song now pops the SongDetailViewController from the navigation stack
Merge remote-tracking branch 'origin/master'