Merge pull request #1 from yunxiyinzhe/master

fix all the warnings
small changes for webtanslation layout
move String resources to string.xml
change UI of web translation
Merge pull request #2 from yunxiyinzhe/develop

Develop