fixed additional bug where channel order was not respected in ft_freqstatistics


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7696 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement #1135 - re-added combined planar neighbour definition, deleted concatenated all neighbour template

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7697 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip