change settlement nomenclature and order
Merge branch 'master' of github.com:baiche/Tauto

Conflicts:
	ScriptPeuplementTypeAbonnement.sql