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
Load color_fa: It is also possible now to load the color_fa created by Trackvis as structural image.
Color_fa created by TrackVis::Diffusion Toolkit can be loaded as structural
Merge branch 'color_fa' of https://github.com/dporro/tractome into color_fa