lines - hate it!
Merge branch 'develop' of https://github.com/Caleydo/caleydo.git into develop