Fixed #1512 according to @sgratzl's suggestion. 
Fixed null-check in enroute that caused NPE
Merge branch 'develop' of https://github.com/Caleydo/caleydo.git into develop