on upload the correct locale should be chosen when pushing all locales, for instance android xml
renamed some methods to better understand workflow
removed 'then' and unnecessary to guess a locale if one was provided
Merge pull request #44 from phrase/upload_locale_chosen_correctly

Upload locale chosen correctly