commit
Merge branch 'master' of https://github.com/HSLUStefanBachmann/PAWI_AndroidPlaylist

Conflicts:
	AndroidPlaylisten/res/layout/row_playback_playlist.xml