line
line feeds
Merge branch 'develop' of https://github.com/Caleydo/caleydo into
develop

Conflicts:
	org.caleydo.core/src/org/caleydo/core/io/gui/dataimport/wizard/ColumnDataPropertiesDialog.java
	org.caleydo.core/src/org/caleydo/core/view/MinimumSizeComposite.java
	org.caleydo.core/src/org/caleydo/core/view/opengl/canvas/AGLView.java
	org.caleydo.core/src/org/caleydo/core/view/opengl/picking/PickingManager.java