begin integration of API with framework
Merge branch 'trunk' of github.com:the-virtual-brain/framework_tvb into trunk

Conflicts:
	tvb/interfaces/web/controllers/api/simulator_controller.py
	tvb/interfaces/web/run.py
Fix failure to import tvb.config.settings

The SVN contains bin/ and externals, while the Git repo doesn't
and this module imports the bin folder (!) making it impossible
to use the framework from the Git repos. This commit uses the
current directory as a bad guess for the bin and externals folders.
merge updates