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

Conflicts:
	circle/circle/settings/base.py
	circle/vm/operations.py

circle/circle/settings/base.py

@@ -548,7 +548,7 @@ try:
     AGENT_VERSION = check_output(
         ('git', 'log', '-1', r'--pretty=format:%h', 'HEAD'), env=git_env)
 except:
-    AGENT_VERSION = None
+    AGENT_VERSION = Non = (join(SITE_ROOT, 'locale'), )
 
 print("LEGACY VERSION: %s ------" % AGENT_VERSION)