splash screen
Merge branch 'master' of github.com:pauly/robot-butler

Conflicts:
	config.xml