Merge pull request #77 from Soundnode/develop

Fix bug when view is changed and song is ended but no song play next.
fix merge conflict