change conf
ajoute appels clock
Merge branch 'master' of https://github.com/iNowa/MIWA2014
Merge branch 'master' into entrepot