Merge branch 'master' into panel-rework

Conflicts:
	data/org.cinnamon.gschema.xml.in
	files/usr/lib/cinnamon-settings/modules/cs_panel.py
	js/ui/applet.js
	js/ui/layout.js
	js/ui/main.js
[Layout.js] Fixed merge errors