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

merge mne-tools/master
Merge pull request #95 from farndt/master

removal of warnings under linux gcc
babymeg display
babymeg
logo
layout
default size
Add the new plotter for SQUID control
Merge pull request #96 from liminsun/master

Add the new plotter for SQUID control
project dialog
Merge branch 'master' of https://github.com/mne-tools/mne-cpp

Conflicts:
	applications/mne_x/plugins/babymeg/babymeg.pro
moved plotter
neuromag fix
press record
babymegclient 5 reconnects
record update
babymeg record
record resource
cluster info
cluster Info