Merge branch 'devel' into LilyPrintDEV

Conflicts:
	src/octoprint/settings.py
	src/octoprint/static/js/app/viewmodels/appearance.js
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/settings.jinja2