Merge branch 'wip-all-signal-display' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into integration-1.0

Conflicts:
	applications/demos/motor-imagery/bci-examples/motor-imagery-CSP/mi-csp-4-online.xml
	applications/demos/motor-imagery/bci-examples/motor-imagery/motor-imagery-bci-2-classifier-trainer.xml
	applications/demos/motor-imagery/bci-examples/motor-imagery/motor-imagery-bci-3-online.xml
	applications/demos/motor-imagery/bci-examples/motor-imagery/motor-imagery-bci-4-replay.xml
	applications/demos/p300/bci-examples/p300-magic-card/p300-magic-card-2-train-classifier.xml
	applications/demos/p300/bci-examples/p300-magic-card/p300-magic-card-3-online.xml
	applications/demos/p300/bci-examples/p300-speller-xDAWN/p300-xdawn-3-train-classifier.xml
	applications/demos/p300/bci-examples/p300-speller-xDAWN/p300-xdawn-4-online.xml
	applications/demos/p300/bci-examples/p300-speller/p300-speller-2-train-classifier.xml
	applications/demos/p300/bci-examples/p300-speller/p300-speller-3-online.xml
	applications/demos/ssvep-demo/bci-examples/ssvep/ssvep-bci-5-online-test-shooter.xml
	applications/demos/ssvep-mind-shooter/bci-examples/ssvep-mind-shooter/ms-4-classifier-training-csp.xml
	applications/demos/ssvep-mind-shooter/bci-examples/ssvep-mind-shooter/ms-5-online-test-shooter.xml
	applications/demos/vr-demo/bci-examples/handball/handball-replay.xml
	contrib/applications/platform/P300Stimulator/share/scenarios/bci-examples/p300-coadapt-stimulator/p300-coadapt-online-with-monitoring.xml
	contrib/applications/platform/P300Stimulator/share/scenarios/bci-examples/p300-coadapt-stimulator/p300-coadapt-online-without-monitoring.xml