Merge pull request #2 from LorenzE/TMSI_EEG

Tmsi eeg
Merge pull request #5 from LorenzE/TMSI_EEG

Tmsi eeg
- added EEG source localization example
- changed triggercontrol plugin with the help of Tobi
- minor changes in rawClusteredInverse/main.cpp and rawClusteredInverseEEG/main.cpp
- temporarily excluded triggercontrol pugin
- minor changes in tmsi plugin
- minor path changes in rawClusteredInverseEEG/main.cpp
- minor changes in tmsi GUI and rawClusteredInverseEEG/main.cpp
Merge branch 'master' of https://github.com/mne-tools/mne-cpp into TMSI_EEG
bugfix in mne_browse_raw_qt
Merge branch 'master' of https://github.com/LorenzE/mne-cpp into TMSI_EEG
- added trigger event beep to tmsi plugin
Merge branch 'master' of https://github.com/mne-tools/mne-cpp into TMSI_EEG

Conflicts:
	applications/mne_x/plugins/triggercontrol/FormFiles/triggercontrolsetup.ui
	applications/mne_x/plugins/triggercontrol/FormFiles/triggercontrolsetupwidget.cpp
	applications/mne_x/plugins/triggercontrol/FormFiles/triggercontrolsetupwidget.h
	applications/mne_x/plugins/triggercontrol/serialport.cpp
	applications/mne_x/plugins/triggercontrol/serialport.h
	applications/mne_x/plugins/triggercontrol/triggercontrol.cpp
	applications/mne_x/plugins/triggercontrol/triggercontrol.h
- deleted triggercontrol temporary
- added triggercontrol plugin again
Merge pull request #64 from LorenzE/TMSI_EEG

Tmsi eeg
[bugfix] generics lib