Generate a full working command line
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/Data.h
	Model/File.h
	Model/Project.h
	Model/Stream.h
Merge branch 'master' of https://github.com/cinemaouvert/OCT