Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - allow the parcellation to be specified separate from the source structure, enhanced test script. See #1775
Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - allow the parcellation to be specified separate from the source structure, enhanced test script. See #1775
enhancement - improvements for old-to-new source structure update, a.o. dealing with logical inside
enhancement - call ft_checkdata at th eened of sourceanalysis, this ensures that the output structure is fully sane
enhancement - deal with the special case of dimord {pos_pos}
enhancement - new implementation for the core section of ft_sourceparcellate, now with proper looping over bivariate parcel-combinations. Implemented mean/min/max/eig as methods. Extended the test script. See #1775
enhancement - converted test script into proper function, some cleanups, few more test cases for {pos_pos}
Merge branch 'bug1775' of github.com:oostenveld/fieldtrip into bug1775

Conflicts:
	ft_sourceparcellate.m
	test/test_bug1775.m
fixed even more merge conflicts
Merge branch 'master' of github.com:fieldtrip/fieldtrip

Conflicts:
	ft_sourceparcellate.m
Merge pull request #8 from oostenveld/master

another attempt to merge the sourceparcellate changes into the blessed/release version