Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
chg: comment in mainwindow.cpp
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	examples/matchingPursuit/mainwindow.cpp
chg: comments
CHG: License, Comments MainWindow: MultiChannelComboBox