Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/LostSign/mne-cpp
CHG: comments, coding standards
Merge branch 'master' of https://github.com/mne-tools/mne-cpp

Conflicts:
	examples/matchingPursuit/treebaseddictwindow.h
Merge branch 'master' of https://github.com/LostSign/mne-cpp

Conflicts:
	examples/matchingPursuit/mainwindow.h
MERGE: send_input was missing
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	examples/matchingPursuit/treebaseddictwindow.h