Résolution d erreur
Merge branch 'master' of https://github.com/thomasNDS/SmartCampus2014