Passage en 2.1.4

Signed-off-by: yroffin <yroffin@gmail.com>
Merge branch 'master' of git@github.com:yroffin/jbehaviour-tools-ui.git

Conflicts:
	jbehaviour-tools-ui.cmd
	project/Build.scala

Signed-off-by: yroffin <yroffin@gmail.com>