file split fix
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/GBeret/mne-cpp

Conflicts:
	MNE/utils/utils.pro
	applications/applications.pro
chn: return values calculate_atom
chg: settingswindow
new: figure of merit in mainwindow.cpp
chg: stylesheets
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Merge branch 'master' of https://github.com/LostSign/mne-cpp
chd: FOM