Merge branch 'uidev'
added translate key for remove log
Merge branch 'master' into uidev