update merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/OCTDispatcher.cpp
	Model/Stream.cpp
Merge branch 'master' of https://github.com/cinemaouvert/OCT

Conflicts:
	Controller/OCTDispatcher.cpp