Merge SVN-GIT

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

Conflicts:
	tvb/adapters/matlab_engine.py
	tvb/config/settings.py
	tvb/interfaces/console.py
	tvb/interfaces/web/controllers/api/profiling.py
	tvb/interfaces/web/controllers/api/yappi_stats.py

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5967 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5968 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5969 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5970 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5971 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5972 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5973 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5974 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Small code review.

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5975 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Fix error from merge

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5976 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1356 Special case svg viewer for portlet mode

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5977 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-899 Fixed bad burst branch name

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5978 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-899 Ignore burst name sent by client in the case of a branch

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5979 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1164 Add sqlalchemy logging for dev profile

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5981 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1164 Add profiling decorators

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5982 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1164 Separated data gathering from view logic. Improved performance by not repeating data gathering for each metric

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5983 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1237 Code review; Replaced WindowsError with more generic OSError

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5984 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Allow reading of datatype attributes that are not ndarrays

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5985 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
TVB-1351 A first draft of the tractography importer; Add colors to tracts

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/framework_tvb@5986 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1