try to remove parentComposite field for better encapsulation of gl views
#1435 preference entry
start concept of Units (px, em, pt, dip) + adaptions
draft #1435
Merge remote-tracking branch 'origin/develop' into develop_scaling
#1435 simplification + improve text font mapping
#1435 scrolling fixes for mac
Merge branch 'develop' of git@github.com:Caleydo/caleydo-dev.git into develop_scaling
Merge branch 'develop_scaling' of git@github.com:Caleydo/caleydo-dev.git into develop_scaling
#1435 pathway + dvi scrolling update bugfix
fix #1464 tcga note
Merge remote-tracking branch 'origin/develop' into develop_scaling

Conflicts:
	org.caleydo.view.tourguide/src/org/caleydo/view/tourguide/impl/GeneSetEnrichmentScoreFactory.java
renaming brick to block in tour guide
Merge remote-tracking branch 'origin/develop_scaling' into develop

Conflicts:
	org.caleydo.view.pathway/src/org/caleydo/view/pathway/fsTextOverlay.glsl