auto-d
Merge branch 'master' of https://github.com/yeren/background.git

Conflicts:
	config/coherence.properties
eww