fix peditor_img
Merge branch 'master' of https://github.com/SummersAdvertising/taii
Pull from toto
Merge branch 'master' of https://github.com/SummersAdvertising/taii
modify locale files