INSTABLE : Modification des modes de calcul des indicateurs
Merge branch 'master' of https://github.com/HadrienMP/time_manager_js

Conflicts:
	js/puncher.js