Added feature description for Velvet feature models.
Bugfix for problem marker creation for velvet models.
Bugfix for Velvet export and import.
Added file filter for import dialog.
intermediate results issue #151
Fixed issue in ContextOutlineLabelProvider
cleanup in variantimport plugin
Merge branch 'master' of https://ktonscheidt@github.com/tthuem/FeatureIDE
Changed minimum java version of all plugin projects to Java 1.7. Updated
the pluginbuilder accordingly.
Merge remote-tracking branch 'Master/master'

Conflicts:
	plugins/de.ovgu.featureide.core.featurehouse/.classpath