merge
Merge branch 'develop' of https://github.com/Caleydo/caleydo into develop
testing line endings