optimisation
Merge branch 'master' of https://github.com/neokeld/Flot-code

Conflicts:
	Chargement.py