peu de changements
Merge branch 'master' of http://github.com/14roiron/smartgrid
Merge branch 'master' of http://github.com/14roiron/smartgrid
2 petits changements