Merge pull request #312 from penguinho/master

Android Language/Locale and 1.1.0