Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp

Conflicts:
	MNE/utils/utils.pro
	applications/applications.pro
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
chg: read fiff ave
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
chg: spacer
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	examples/matchingPursuit/mainwindow.cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
dbg: read average files
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	MNE/utils/utils.pro
	applications/applications.pro