rtsss update
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

Conflicts:
	applications/applications.pro
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 git://github.com/slew/mne-cpp

Conflicts:
	applications/applications.pro