modify default encode UTF-8
Merge branch 'refs/heads/master' into BillingSystem