small bugfixes
Merge branch 'develop' of git@github.com:Caleydo/caleydo-dev.git into develop
fix win & mac config