Commit voor conflicts, yay
Merge branch 'master' of https://github.com/omkelderman/YouSync.git

Conflicts:
	YouSync/YouSync/src/PlaylistView.cpp