MEDIUM / Binding refactoring / WIP
MEDIUM / Binding refactoring / WIP
MEDIUM / Binding refactoring / WIP / Start FIB model refactoring
MEDIUM / Binding refactoring / WIP / Start FIB model refactoring
Merge branch '1.5' into new_binding_model

Conflicts:
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/DataBinding.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBButton.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBTextFieldColumn.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBTextWidget.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBWidget.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/utils/BindingSelector.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/utils/BindingSelectorPanel.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/view/widget/browser/FIBBrowserElementType.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/view/widget/table/FIBTableActionListener.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/view/widget/table/FIBTableModel.java
	flexodesktop/generators/flexogenerator/src/main/java/org/openflexo/velocity/VPBindingEvaluator.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/view/action/EditionSchemeAction.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingEvaluator.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingExpression.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingExpressionFactory.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingFactory.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingValueFactory.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/BindingVariableImpl.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/DataBinding.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/DefaultBindingFactory.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/DependingObjects.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/StaticBinding.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/StaticBindingFactory.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/expr/Expression.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/expr/Function.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/expr/Variable.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/expr/oldparser/ExpressionParser.java
	flexodesktop/model/flexoutils/src/test/java/org/openflexo/antar/binding/TestBinding.java
MEDIUM / New binding model / WIP / First version of BindingSelector
working with 'basic' bindings
MEDIUM / New binding model / WIP / First version of BindingSelector
working with 'basic' bindings
MEDIUM / New binding model / WIP / First version of BindingSelector
starting working with 'expression' bindings
MEDIUM / New binding model / WIP / First version of BindingSelector
starting working with 'expression' bindings / Works better
Merge branch 'new_flexo_ontology_layer' into new_binding_model

Conflicts:
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/view/widget/FIBTableWidget.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/view/widget/browser/FIBBrowserModel.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/ontology/EditionPatternReference.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/ClassParameter.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/IndividualParameter.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/ObjectPropertyParameter.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/PropertyParameter.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/binding/EditionPatternParameterPathElement.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/inspector/ClassInspectorEntry.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/inspector/IndividualInspectorEntry.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/viewpoint/inspector/ObjectPropertyInspectorEntry.java
MEDIUM / New binding model / WIP
LOW / Debugging new binding model / WIP
Merge branch 'new_flexo_ontology_layer' into new_binding_model
MEDIUM / Repairing new BindingModel in FIB / WIP
MEDIUM / Repairing new BindingModel in FIB / WIP
MEDIUM / Support for cast in AnTAR expressions
MEDIUM / Repair bindings in FIB after binding model refactoring
MEDIUM / Repair bindings in FGE after binding model refactoring / WIP
Merge branch 'new_flexo_ontology_layer' into new_binding_model

Conflicts:
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBComponent.java
Merge branch 'new_binding_model' of
ssh://git@github.com/agilebirds/openflexo into new_binding_model

Conflicts:
	flexodesktop/GUI/flexointerfacebuilder/src/dev/java/org/openflexo/fib/editor/controller/FIBInspectorController.java
	flexodesktop/GUI/flexointerfacebuilder/src/main/java/org/openflexo/fib/model/FIBCustom.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/binding/DataBinding.java
	flexodesktop/model/flexoutils/src/main/java/org/openflexo/antar/expr/BindingValue.java