Merge branch 'background' of github.com:JosephMcc/Cinnamon

Conflicts:
	js/ui/backgroundManager.js
Fix merge conflict error