Merge remote-tracking branch 'origin/master'

Conflicts:
	code.oz
RepetitionD merge
Merge branch 'master' of https://github.com/timalengreau/projet-info-2014