Merge branch 'master' into raven
update
update
update
update
update
update
update
remove t
update
Merge branch 'raven' of https://github.com/ludwiksh/Etales into raven
Merge branch 'raven'
update translation
update