Localization 1/2
Merge remote-tracking branch 'origin/mgalctc'