MOBILE-933
Merge pull request #86 from jmpascal/master

MOBILE-933 : Localization
Merge remote-tracking branch 'upstream/master'