tentative de correction bug
Merge branch 'master' of github.com:thomasNDS/SmartCampus2014