Merge pull request #9 from jcmunozf/development

missing class included
Initial expressions for: concepts, direct hard relations and group hard
relations defined. All converted to HlclProgram.
Return set from solved managed to update the GUI.
Alternative to BooleanExpression implemented.
Corrections on group dependency relations
Merge pull request #11 from jcmunozf/development

Development
Definition of classes to retrieve hlcl program, expressions, negations,
etc

missing update on Hlcl2Prolog included
Merge pull request #12 from jcmunozf/development

Definition of classes to retrieve hlcl program, expressions, negations,
Changes on Refas2Hlcl to use other classes
Merge pull request #13 from jcmunozf/development

Changes on Refas2Hlcl to use other classes
solve null on assign boolean transformation
Revision of negations expressions
documentation of classes
Merge pull request #15 from jcmunozf/development

Development - implementation of simulation classes and expressions displays, negations corrected.
Merge remote-tracking branch 'luisa/mergeDeveloppment' into development

Conflicts:
	com.cfm.productline.defectAnalyzer/bin/testModels/prologFiles/SWI_PROLOGFeature10ModelAllFormatsFeatureModelFeatureModel2.pl
	com.cfm.productline.defectAnalyzer/test/testModels/prologFiles/SWI_PROLOGFeature10ModelAllFormatsFeatureModelFeatureModel2.pl
conflicts resolve
Dynamic property tabs
missing file
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	com.cfm.productline.io/.classpath
	com.cfm.productline.io/src/com/cfm/productline/io/SXFMReader.java
	com.variamos.gui/src/com/variamos/gui/maineditor/AbstractGraph.java
	com.variamos.gui/src/com/variamos/gui/maineditor/VariamosGraphEditor.java
	com.variamos.gui/src/com/variamos/gui/maineditor/resources/editor.properties
	com.variamos.gui/src/com/variamos/gui/refas/editor/MetaGraphEditorFunctions.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/MetamodelGraph.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasConfiguratorPanel.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/RefasGraph.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/SimulationGraphEditorFunctions.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/actions/SharedActions.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/ClassWidget.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/EnumerationWidget.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/MClassWidget.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/MEnumerationWidget.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/RefasWidgetFactory.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/SetWidget.java
	com.variamos.gui/src/com/variamos/gui/refas/editor/widgets/WidgetR.java
	com.variamos.refas.core/.classpath
	com.variamos.refas.core/src/com/variamos/refas/core/simulationmodel/Refas2Hlcl.java
	com.variamos.refas.core/src/com/variamos/refas/core/simulationmodel/RestrictionConstraint.java
	com.variamos.refas.core/src/com/variamos/refas/core/staticconcepts/Refas.java
	com.variamos.refas.core/src/com/variamos/refas/core/staticconcepts/SemanticPlusSyntax.java
dynamic property tabs recovered
Merge pull request #19 from jcmunozf/development

Development
SWI prolog working with GUI
Merge pull request #20 from jcmunozf/development

SWI prolog working with GUI