merge
Merge branch 'master' of https://github.com/thammasart/fineArtTu
 fix tax fix edit
Merge branch 'master' of https://github.com/thammasart/fineArtTu