correction Issue #22
Merge branch 'master' of https://github.com/cinemaouvert/opp

Conflicts:
	src/playlistmodel.h