Distance en miles
sync
Merge branch 'master' of github.com:A2Zi/Springbok-Framework

Conflicts:
	includes/js-utils