Merge remote-tracking branches 'mne-tools/master' and 'origin/master'

merge mne-tools/master
Merge remote-tracking branch 'mne-tools/master'
Merge remote-tracking branch 'mne-tools/master'
-> update ignored binaries
-> removal unused parameter warnings
Merge branch 'master' of https://github.com/mne-tools/mne-cpp

Conflicts:
	applications/mne_x_libs/xDisp/helpers/realtimemultisamplearraydelegate.cpp
	applications/mne_x_libs/xDisp/realtimemultisamplearraywidget.cpp
removal sign usign warnings
Merge pull request #109 from farndt/master

removal warnings and add binaries