Merge branch 'master' of https://git.ik.bme.hu/circle/cloud

Conflicts:
	circle/vm/operations.py

circle/circle/settings/base.py

@@ -583,7 +583,6 @@ def GET_AGENT_VERSION_BY_SYSTEM(agent_system):
     return ret, AGENT_DIR + "/agent-" + agent_system.lower() + "-" + ret
 
 
-LOCALE_PATHS = (join(SITE_ROOT, 'locale'), )
 COMPANY_NAME = get_env_variable("COMPANY_NAME", "BME IK 2015")
 
 first, last = get_env_variable(