solving events incoherence
Merge branch 'master' of https://github.com/Ljinod/2014-INFSI351-Projet-Wassup
solving merge conflict