update documentary I
Merge branch 'master' of https://github.com/mne-tools/mne-cpp

Conflicts:
	applications/mne_x/plugins/triggercontrol/serialport.h
	applications/mne_x/plugins/triggercontrol/triggercontrol.h
documentary II
small fixes
style
comment
style & namespaces
style
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
triggercontrol - updated documentation
chg: class GaborAtom
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	examples/matchingPursuit/main.cpp
Merge branch 'master' of https://github.com/GBeret/mne-cpp

Conflicts:
	MNE/utils/mp/atom.cpp
	MNE/utils/mp/atom.h
Merge pull request #92 from TiKunze/master

documentary III
Merge branch 'master' of https://github.com/GBeret/mne-cpp
Merge remote-tracking branches 'mne-tools/master' and 'origin/master'
- adding binaries to ignore
- removal comparison warnings
minor changes
lnt adaption
lnt