Merge branch 'master' of github.com:guyrotem/google-translate-server

 Please enter a commit message to explain why this merge is necessary,