Merge branch 'master' of https://github.com/cinemaouvert/opp

Conflicts:
	src/mainwindow.cpp