update
cleaned triggersetupwidget srface

added m_wiredchannel, in which the channel is saved which is modified during the run method
Merge branch 'master' of git://github.com/TiKunze/mne-cpp

Conflicts:
	applications/mne_x/plugins/triggercontrol/triggercontrol.cpp