Smoothing camera mooving
Modification on settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/arm/settings.yaml
	src/test/globalTest.py