Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into wip-gserrier-multiclass-pairing

Conflicts:
	applications/demos/motor-imagery/bci-examples/motor-imagery-CSP/motor-imagery-bci-3-classifier-trainer.xml
	applications/demos/motor-imagery/bci-examples/motor-imagery-CSP/motor-imagery-bci-4-online.xml
	applications/demos/motor-imagery/bci-examples/motor-imagery-CSP/motor-imagery-bci-5-replay.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-classifier-processor.cfg
	applications/demos/p300/bci-examples/p300-speller-xDAWN/p300-speller-3-train-classifier.xml
	applications/demos/p300/bci-examples/p300-speller-xDAWN/p300-speller-4-online.xml
	applications/demos/p300/bci-examples/p300-speller-xDAWN/p300-speller-5-replay.xml
	applications/demos/p300/bci-examples/p300-speller/p300-classifier-processor.cfg
	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-4-classifier-training.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/4-classifier-training-csp.xml
	applications/demos/ssvep-mind-shooter/bci-examples/ssvep-mind-shooter/5-online-test-shooter.xml
	applications/demos/ssvep-mind-shooter/bci-examples/ssvep-mind-shooter/6-performance-test.xml