Merge branch 'dev/translationsAsPackages' of github.com:foosel/OctoPrint into dev/translationsAsPackages

Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py

src/octoprint/server/util/flask.py

@@ -61,6 +61,7 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
 		dirs = additional_folders + [os.path.join(self.app.root_path, 'translations')]
 
 		result = [Locale.parse(default_locale)]
+
 		for dir in dirs:
 			result += list_translations(dir)
 		return result

src/octoprint/server/views.py

@@ -20,7 +20,6 @@ from . import util
 import logging
 _logger = logging.getLogger(__name__)
 
-
 @app.route("/")
 @util.flask.cached(refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values, key=lambda: "view/%s/%s" % (request.path, g.locale))
 def index():