fixed Diana's email
Merge pull request #1 from dporro/master

Some of the detected bugs already fixed
Merge pull request #2 from dporro/mac-os

MAC-OS porting
Fixed pyglet bug on macos.
Loading of color_fa created with TrackVis::Diffusion Toolkit is now supported
Merge branch 'dporro-color_fa'
Merge branch 'macos-env' of https://github.com/Paolopost/tractome into Paolopost-macos-env
Merge branch 'Paolopost-macos-env'
Workaround for MenuBar in MAC-OS
Merge branch 'mac-os' of https://github.com/dporro/tractome into mac-os