source organzie to clean imports
Merge remote-tracking branch 'origin/master'

Conflicts:
	org.osate.xtext.aadl2.featuregroupmapping/bin/org/osate/xtext/aadl2/featuregroupmapping/parser/antlr/internal/InternalFeatureGroupMappingParser$FollowSets000.class
	org.osate.xtext.aadl2.featuregroupmapping/bin/org/osate/xtext/aadl2/featuregroupmapping/parser/antlr/internal/InternalFeatureGroupMappingParser.class
	org.osate.xtext.aadl2.featuregroupmapping/bin/org/osate/xtext/aadl2/featuregroupmapping/parser/antlr/lexer/InternalFeatureGroupMappingLexer.class
	org.osate.xtext.aadl2.featuregroupmapping/bin/org/osate/xtext/aadl2/featuregroupmapping/services/FeatureGroupMappingGrammarAccess$FeatureMappingsetElements.class
	org.osate.xtext.aadl2.featuregroupmapping/src-gen/org/osate/xtext/aadl2/featuregroupmapping/FeatureGroupMapping.xtextbin