Merge branch 'master' into i10n/zh_TW
i10n: Traditional Chinese language for launcher updated.
Merge pull request #482 from civalin/i10n/zh_TW

Traditional Chinese translation for launcher updated.