Can now switch between mapped colors and dataset colors in enroute
(#1759)
Merge branch 'develop' of https://github.com/Caleydo/caleydo.git into develop
now using correct icon for color switching (#1759)