commit
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	Ville.py
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	main.py
ok
Merge branch 'master' of https://github.com/14roiron/smartgrid
Merge branch 'master' of https://github.com/14roiron/smartgrid
eol
qsdf
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	Equipement/ParcEolien.py
	Ville.py
Merge branch 'master' of https://github.com/14roiron/smartgrid
robustesse !