prepare release version 3.1.0-beta1
Merge branch 'develop' of github.com:Caleydo/caleydo into develop

Conflicts:
	org.caleydo.core/META-INF/MANIFEST.MF
	org.caleydo.core/OSGI-INF/l10n/bundle.properties
	org.caleydo.core/filtered/version.properties
	org.caleydo.core/pom.xml
	org.caleydo.data.importer/META-INF/MANIFEST.MF
	org.caleydo.data.importer/pom.xml
	org.caleydo.data.pathway.kegg/META-INF/MANIFEST.MF
	org.caleydo.data.pathway.kegg/pom.xml
	org.caleydo.data.pathway.wikipathways/META-INF/MANIFEST.MF
	org.caleydo.data.pathway.wikipathways/pom.xml
	org.caleydo.data.tcga/META-INF/MANIFEST.MF
	org.caleydo.data.tcga/pom.xml
	org.caleydo.data/META-INF/MANIFEST.MF
	org.caleydo.data/pom.xml
	org.caleydo.datadomain.generic/META-INF/MANIFEST.MF
	org.caleydo.datadomain.generic/pom.xml
	org.caleydo.datadomain.genetic/META-INF/MANIFEST.MF
	org.caleydo.datadomain.genetic/pom.xml
	org.caleydo.datadomain.pathway/META-INF/MANIFEST.MF
	org.caleydo.datadomain.pathway/pom.xml
	org.caleydo.internal/pom.xml
	org.caleydo.parent/pom.xml
	org.caleydo.util.bubblesets/META-INF/MANIFEST.MF
	org.caleydo.util.bubblesets/pom.xml
	org.caleydo.util.gleem/META-INF/MANIFEST.MF
	org.caleydo.util.gleem/pom.xml
	org.caleydo.util.r/META-INF/MANIFEST.MF
	org.caleydo.view.bookmark/META-INF/MANIFEST.MF
	org.caleydo.view.bookmark/pom.xml
	org.caleydo.view.dvi/META-INF/MANIFEST.MF
	org.caleydo.view.dvi/pom.xml
	org.caleydo.view.enroute/META-INF/MANIFEST.MF
	org.caleydo.view.enroute/pom.xml
	org.caleydo.view.entourage/META-INF/MANIFEST.MF
	org.caleydo.view.entourage/pom.xml
	org.caleydo.view.filter/META-INF/MANIFEST.MF
	org.caleydo.view.filter/pom.xml
	org.caleydo.view.filterpipeline/META-INF/MANIFEST.MF
	org.caleydo.view.filterpipeline/pom.xml
	org.caleydo.view.heatmap/META-INF/MANIFEST.MF
	org.caleydo.view.heatmap/pom.xml
	org.caleydo.view.histogram/META-INF/MANIFEST.MF
	org.caleydo.view.histogram/pom.xml
	org.caleydo.view.info.dataset/META-INF/MANIFEST.MF
	org.caleydo.view.info.dataset/pom.xml
	org.caleydo.view.info.selection/META-INF/MANIFEST.MF
	org.caleydo.view.info.selection/pom.xml
	org.caleydo.view.kaplanmeier/META-INF/MANIFEST.MF
	org.caleydo.view.kaplanmeier/pom.xml
	org.caleydo.view.parcoords/META-INF/MANIFEST.MF
	org.caleydo.view.parcoords/pom.xml
	org.caleydo.view.pathway/META-INF/MANIFEST.MF
	org.caleydo.view.pathway/pom.xml
	org.caleydo.view.radial/META-INF/MANIFEST.MF
	org.caleydo.view.radial/pom.xml
	org.caleydo.view.search/META-INF/MANIFEST.MF
	org.caleydo.view.search/pom.xml
	org.caleydo.view.selectionbrowser/META-INF/MANIFEST.MF
	org.caleydo.view.selectionbrowser/pom.xml
	org.caleydo.view.stratomex/META-INF/MANIFEST.MF
	org.caleydo.view.stratomex/pom.xml
	org.caleydo.view.table/META-INF/MANIFEST.MF
	org.caleydo.view.table/pom.xml
	org.caleydo.view.tourguide.entourage/META-INF/MANIFEST.MF
	org.caleydo.view.tourguide.entourage/pom.xml
	org.caleydo.view.tourguide.stratomex/META-INF/MANIFEST.MF
	org.caleydo.view.tourguide.stratomex/pom.xml
	org.caleydo.view.tourguide/META-INF/MANIFEST.MF
	org.caleydo.view.tourguide/pom.xml
	org.caleydo.view.treemap/META-INF/MANIFEST.MF
	org.caleydo.view.treemap/pom.xml
	org.caleydo.vis.lineup/META-INF/MANIFEST.MF
	org.caleydo.vis.lineup/pom.xml
	pom.xml