Merge branch 'master' of github.com:oostenveld/fieldtrip
included some small changes from oostenveld/master
Merge branch 'master' of github.com:fieldtrip/fieldtrip
included some small changes from oostenveld/master

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7747 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
automatically synchronized identical files to revision 7747

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7748 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip
restructuring - moved sourceparcellate from hcp to ft, see #1775
enhancement - updated the documentation and added pre/postable, see #1775
enhancement - created test script for timing the leadfield computation
enhancement - changed the persistent variable handling in ft_senslabel, this should be much faster. Added it to the test script. See bug 2085
enhancement - include explicit chantype in the test script, see #2085
enhancement - do not deal with backward compatible grad in ft_compute_leadfield, leave this to ft_prepare_vol_sens. Updated test script for #2085.
enhancement - merged the git and svn change to the test script
Merge branch 'master' of github.com:fieldtrip/fieldtrip
Merge branch 'master' of github.com:fieldtrip/fieldtrip