Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into

neon

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb