Fix Encoding Problem inTH resource Bundle .
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking