möllame playlistiga
möllame pleilistiga
switchin masterisse. Merge branch 'v0.3.1-release'

Conflicts:
	src/app/app.js
	src/app/playlist/playlist.js