Merge branch 'development' into LogBook_v2

Conflicts:
	gui/bitmapLoader.py

config.py

@@ -19,7 +19,7 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.27.2"
+version = "1.27.3"
 tag = "git"
 expansionName = "YC119.2"
 expansionVersion = "1.4"

gui/bitmapLoader.py

@@ -37,7 +37,7 @@ except ImportError:
 
 class BitmapLoader(object):
     try:
-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip', 'r'))
+        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
         logging.info("Using zipped image files.")
     except IOError:
         logging.info("Using local image files.")