new
new git
new
correct bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	k3-al.eclipse/fr.inria.diverse.k3.al.annotationprocessor.plugin/.classpath