Merge branch 'master' into test-3

# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py

config.py

@@ -20,10 +20,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.33.3"
-tag = "git"
-expansionName = "Lifeblood"
-expansionVersion = "1.7"
+version = "1.34.0"
+tag = "Stable"
+expansionName = " Arms Race"
+expansionVersion = "1.3"
 evemonMinVersion = "4081"
 
 pyfaPath = None
@@ -65,7 +65,7 @@ def getPyfaRoot():
 
 
 def getGitVersion():
-    with open(os.path.join(pyfaPath, 'gitversion')) as f:
+    with open(os.path.join(pyfaPath, '.version')) as f:
         version = f.readline()
     return version