Merge branch 'deploy_to_server' into creating_retranslator