Change-Id: Idb3688931f36f6527f6c01f6824b0606094d34df

Conflicts:
	plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
	plugins/org.polarsys.chess.feature/feature.xml

Change-Id: I039c9268bc4bf89bb40dab2a17d639602824444c

Change-Id: Id86724842e819f5335a32c1fb68b595fceed0405

Merge remote-tracking branch 'Polarsys/562302-Implement-unit-tests-for-existing-features' into neon-orig

Resolve "Create CHESS Bundle via Maven"

Closes #251

See merge request CPS_Design/CHESS!59

Change-Id: If35f9beee35b7366d1a7327235ecee8ffbb04a9c

Change-Id: I4f309ffa4fd58f6eb1f365a1181fb211ae252d18

Change-Id: I0ae22fc052cc23f5a377a6a36d553e538f206fb2

Change-Id: Ic93726f17b4db7fa8926d4c505a3f037a58f7bcb

Change-Id: I57accfabe9ed7980b8184754673dc0d25811a136

feature.

Change-Id: I058ab16f63ce5a94a4370be388a7f2f3720b67c0

Merge branch '251-create-chess-bundle-via-maven' of git@gitlab.fbk.eu:CPS_Design/CHESS.git into 251-create-chess-bundle-via-maven

Change-Id: I5409d8d57a33344c87e2b2bd0f78be740bd22d90

Resolve "Add new constructors to StateStatus checker"

Closes #252

See merge request CPS_Design/CHESS!60

Signed-off-by: Nicholas Pacini <nicholas.pacini@intecs.it>

Change-Id: I1bea7abf7bee1722e2db1a22c3306e59ebce78bd

Change-Id: I79ee991519431bbb5c0f239bce7ac7c5917f01b1

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Change-Id: I09a7b27be424c329b421a36db884ffd571e2bcb7

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I53087b42678e799d1486c9ffc95f7d067c904987

neon

Conflicts:
	plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java

Change-Id: Ic71a82e6298bac55dc19b7a28b9ec78c4c3fe74d

Change-Id: I276bc62b5d825213b69c65a43c0e1946c6783268

Change-Id: I03b08c8e852ca377398949ce2203cc5ed44a6603

Change-Id: I03488353081aa90d389d6cf7ecc72d6dae991501

updated site.xml

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>