Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/GBeret/mne-cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
chg: prepared for "fix phase" adaptive mp
new: fix phase mp, ToDo: recalc max_scalar_product
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
chg/dbg: fix phase adaptive mp
Merge branch 'master' of https://github.com/LostSign/mne-cpp

Conflicts:
	examples/matchingPursuit/mainwindow.h