Merge branch 'master' into py-package

Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css

overviewer_core/configParser.py

@@ -4,7 +4,8 @@ import os.path
 import logging
 
 class OptionsResults(object):
-    pass
+    def get(self, *args):
+        return self.__dict__.get(*args)
 
 class ConfigOptionParser(object):
     def __init__(self, **kwargs):