display the scale on the right
add the UI button to enable the scale
update the tests tolerance
change the image due to the cross position
change the scale size
fix inheritance issue
Merge branch 'master' into 201-ta-ruler-right
fix naming
Revert "change the image due to the cross position"

This reverts commit 287e1cd1dd20c40ff20081f2708cba302933a11a.
try the new image
restore travis.yml
Merge branch 'master' into 201-ta-ruler-right

Conflicts:
	app/Joker/fr_FR.ts
update the ruler
Merge pull request #252 from ThomasAy/201-ta-ruler-right

update the ruler
Merge pull request #246 from Phonations/201-ta-ruler-right

201 ta ruler right