update
Merge branch 'master' of https://github.com/xufeiyun/LanguageTranslator

Conflicts:
	popup.html