Merge conflict in seeg_region_deterministic demo.
updated documentation in basic and framework classes and tests
Merge remote-tracking branch 'upstream/trunk' into trunk

Conflicts:
	tvb/simulator/demos/seeg_region_deterministic.py
	tvb_library_test/datatypes/sensors_test.py

Kept the newer version.
fixed errors with sphinx documentation format
Merge pull request #5 from cipri-tom/trunk

Trunk