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

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@6272 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1440
Review Rober's recently committed code from Github.
Fix the viewer to work with short signal.
Correct usage of the color-scheme component.

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@6273 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1440
Small fixes in comments.

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