修正顯示問題
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/configs/language.tmx