Merge branch 'Mix'

Conflicts:
Projet2014/code.oz