Small modifications before to pull...
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe

Conflicts:
	streamingparametersconfigurationwindow.cpp