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

Conflicts:
	applications/mne_x/plugins/plugins.pro