Merge branch 'trunk' of https://github.com/the-virtual-brain/tvb-library into trunk

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6265 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1477: unit test fro surface simulations with and without subcortical structures

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6267 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1303: support connectivities with subcortical structures for surface simulations

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6268 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1479: rename default region mapping according to changes in previous commit

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6270 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix test after recent code-changes.


git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6271 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Merge branch 'trunk' of https://github.com/the-virtual-brain/tvb-library into trunk