Android and IOS commits
Merge branch 'master' of https://github.com/iohanr/localizationdemo