eigener farbverlauf hinzugefügt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Delightful/bin/Delightful.apk
	Delightful/bin/classes.dex
	Delightful/src/de/thwildau/delightful/ControlActivity.java