import layout V1
Merge branch 'master' of https://github.com/AdrienKuhn/cri-set-et-match

Conflicts:
	.classpath